Skip to content

Commit 3ba0771

Browse files
Clean up libhal configure options
Use saner sed to properly remove unneeded parameters from "configure" var.
1 parent be955cd commit 3ba0771

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,9 @@ install: .stage.LINUX.install
586586
rm -rf $(ARDUINO)
587587
git clone https://github.com/$(GHUSER)/Arduino $(ARDUINO)
588588
(cd $(ARDUINO) && git checkout $(INSTALLBRANCH) && git submodule init && git submodule update)
589-
#echo "-------- Building installable newlib"
590-
#rm -rf arena/newlib-install; mkdir -p arena/newlib-install
591-
#cd arena/newlib-install; $(call setenv,$@); $(REPODIR)/newlib/configure $(CONFIGURENEWLIBINSTALL); $(MAKE); $(MAKE) install
592589
echo "-------- Building installable hal"
593590
rm -rf arena/hal-install; mkdir -p arena/hal-install
594-
cd arena/hal-install; $(call setenv,$@); $(REPODIR)/lx106-hal/configure --prefix=$(ARDUINO)/tools/sdk/libc --libdir=$(ARDUINO)/tools/sdk/lib --host=xtensa-lx106-elf $$(echo $(call configure,$@) | sed 's/--host=[a-zA-Z0-9_-]*//' | sed 's/--prefix=[a-zA-Z0-9_-]*//')
591+
cd arena/hal-install; $(call setenv,$@); $(REPODIR)/lx106-hal/configure --prefix=$(ARDUINO)/tools/sdk/libc --libdir=$(ARDUINO)/tools/sdk/lib --host=xtensa-lx106-elf $$(echo $(call configure,$@) | sed 's/--host=.*\s//' | sed 's/--prefix=.*\s//' | sed 's/--disable-libstdcxx-verbose//' )
595592
cd arena/hal-install; $(call setenv,$@); $(MAKE) ; $(MAKE) install
596593
echo "-------- Copying GCC libs"
597594
#cp $(call install,$@)/lib/gcc/xtensa-lx106-elf/*/libgcc.a $(ARDUINO)/tools/sdk/lib/.

0 commit comments

Comments
 (0)