Skip to content

Commit b543b1f

Browse files
authoredFeb 5, 2020
Allow to override toolchain path (#45)
* Allow to override toolchain path * abspath to provide correct TOOLS downstream * ensure patch can patch again * also abspath provided arg
1 parent 9cf9f5a commit b543b1f

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed
 

‎Makefile.arduino

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
PREFIX ?= ../../../xtensa-lx106-elf
12

23
%:
34
for v6 in 0 1; do \
@@ -14,7 +15,7 @@
1415
LWIP_LIB=liblwip$$((2+4*v6))-$$mss$$featname.a \
1516
LWIP_LIB_RELEASE=../../lib/liblwip$$((2+4*v6))-$$mss$$featname.a \
1617
LWIP_INCLUDES_RELEASE=../include \
17-
TOOLS=../../../xtensa-lx106-elf/bin/xtensa-lx106-elf- \
18+
TOOLS=$(abspath $(wildcard $(PREFIX)))/bin/xtensa-lx106-elf- \
1819
TCP_MSS=$$mss LWIP_FEATURES=$$feat LWIP_IPV6=$$v6 \
1920
BUILD=build-$$mss$$featname-v$$((4+2*v6)) \
2021
$@ ; \

‎makefiles/Makefile.build-lwip2

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $(LWIP_LIB):
5252
make -f makefiles/Makefile.glue-esp BUILD=$(BUILD) V=$(V)
5353
make -f makefiles/Makefile.glue target=$(target) BUILD=$(BUILD) TCP_MSS=$(TCP_MSS) LWIP_FEATURES=$(LWIP_FEATURES) LWIP_IPV6=$(LWIP_IPV6) V=$(V)
5454
ifeq ($(target),arduino)
55-
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)
55+
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)
5656
else
5757
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)
5858
endif
@@ -81,4 +81,4 @@ endif
8181

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

0 commit comments

Comments
 (0)
Please sign in to comment.