Skip to content

Allow to override toolchain path #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 5, 2020
Merged

Allow to override toolchain path #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f499be8
Allow to override toolchain path
mcspr Jan 31, 2020
f3cef9f
abspath to provide correct TOOLS downstream
mcspr Jan 31, 2020
46f2c4a
ensure patch can patch again
mcspr Jan 31, 2020
298861e
also abspath provided arg
mcspr Jan 31, 2020
f397279
Merge remote-tracking branch 'origin/master' into toolchain-prefix
mcspr Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile.arduino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
PREFIX ?= ../../../xtensa-lx106-elf

%:
for v6 in 0 1; do \
Expand All @@ -14,7 +15,7 @@
LWIP_LIB=liblwip$$((2+4*v6))-$$mss$$featname.a \
LWIP_LIB_RELEASE=../../lib/liblwip$$((2+4*v6))-$$mss$$featname.a \
LWIP_INCLUDES_RELEASE=../include \
TOOLS=../../../xtensa-lx106-elf/bin/xtensa-lx106-elf- \
TOOLS=$(abspath $(wildcard $(PREFIX)))/bin/xtensa-lx106-elf- \
TCP_MSS=$$mss LWIP_FEATURES=$$feat LWIP_IPV6=$$v6 \
BUILD=build-$$mss$$featname-v$$((4+2*v6)) \
$@ ; \
Expand Down
4 changes: 2 additions & 2 deletions makefiles/Makefile.build-lwip2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ $(LWIP_LIB):
make -f makefiles/Makefile.glue-esp BUILD=$(BUILD) V=$(V)
make -f makefiles/Makefile.glue target=$(target) BUILD=$(BUILD) TCP_MSS=$(TCP_MSS) LWIP_FEATURES=$(LWIP_FEATURES) LWIP_IPV6=$(LWIP_IPV6) V=$(V)
ifeq ($(target),arduino)
make -C lwip2-src/src -f ../../makefiles/Makefile.lwip2 BUILD=../../$(BUILD) LWIP_LIB=../../$(LWIP_LIB) SDK=../../$(SDK) TOOLS=../../$(TOOLS) TCP_MSS=$(TCP_MSS) LWIP_FEATURES=$(LWIP_FEATURES) LWIP_IPV6=$(LWIP_IPV6) V=$(V)
make -C lwip2-src/src -f ../../makefiles/Makefile.lwip2 BUILD=../../$(BUILD) LWIP_LIB=../../$(LWIP_LIB) SDK=../../$(SDK) TCP_MSS=$(TCP_MSS) LWIP_FEATURES=$(LWIP_FEATURES) LWIP_IPV6=$(LWIP_IPV6) V=$(V)
else
make -C lwip2-src/src -f ../../makefiles/Makefile.lwip2 BUILD=../../$(BUILD) LWIP_LIB=../../$(LWIP_LIB) TCP_MSS=$(TCP_MSS) LWIP_FEATURES=$(LWIP_FEATURES) LWIP_IPV6=$(LWIP_IPV6) V=$(V)
endif
Expand Down Expand Up @@ -81,4 +81,4 @@ endif

clean:
rm -rf $(BUILD) $(LWIP_LIB) $(AUTO)
cd lwip2-src; rm -f src/.patched src/core/*.c.orig src/core/ipv6/*.c.orig; git checkout -- src;
cd lwip2-src; git checkout -f -- src; git clean -f -- src;