Skip to content

Commit aa41295

Browse files
Makefile: Minor fixes
* typo * "sed" error | pi@atom330:/tmp/esp-quick-toolchain$ sed 's/--prefix=[a-zA-Z0-9_-\\]*//' | sed: -e expression earlephilhower#1, char 29: Invalid range end
1 parent 8903880 commit aa41295

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
476476
(cd $(call arena,$@)/$(GCC_DIR); $(call setenv,$@); $(MAKE) install) >> $(call log,$@) 2>&1
477477
touch $@
478478

479-
.stage.%.libsdtcpp-nox: .stage.%.libstdcpp
479+
.stage.%.libstdcpp-nox: .stage.%.libstdcpp
480480
echo STAGE: $@
481481
# We copy existing stdc, adjust the makefile, and build a single .a to save much time
482482
rm -rf $(call arena,$@)/$(GCC_DIR)/xtensa-lx106-elf/libstdc++-v3-nox > $(call log,$@) 2>&1
@@ -486,7 +486,7 @@ clean: .cleaninst.LINUX.clean .cleaninst.LINUX32.clean .cleaninst.WIN32.clean .c
486486
cp $(call arena,$@)/$(GCC_DIR)/xtensa-lx106-elf/libstdc++-v3-nox/src/.libs/libstdc++.a xtensa-lx106-elf$(call ext,$@)/xtensa-lx106-elf/lib/libstdc++.a >> $(call log,$@) 2>&1
487487
touch $@
488488

489-
.stage.%.hal-config: .stage.%.libsdtcpp-nox
489+
.stage.%.hal-config: .stage.%.libstdcpp-nox
490490
echo STAGE: $@
491491
rm -rf $(call arena,$@)/hal > $(call log,$@) 2>&1
492492
mkdir -p $(call arena,$@)/hal >> $(call log,$@) 2>&1
@@ -591,7 +591,7 @@ install: .stage.LINUX.install
591591
#cd arena/newlib-install; $(call setenv,$@); $(REPODIR)/newlib/configure $(CONFIGURENEWLIBINSTALL); $(MAKE); $(MAKE) install
592592
echo "-------- Building installable hal"
593593
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_-\\]*//')
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_-]*//')
595595
cd arena/hal-install; $(call setenv,$@); $(MAKE) ; $(MAKE) install
596596
echo "-------- Copying GCC libs"
597597
#cp $(call install,$@)/lib/gcc/xtensa-lx106-elf/*/libgcc.a $(ARDUINO)/tools/sdk/lib/.

0 commit comments

Comments
 (0)