gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed typo in lwIP makefile

Browse Source
This commit is contained in:
Joseph Henry
2017-10-19 12:07:37 -07:00
parent 1267b90db5
commit d7a02d3daa
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
make-liblwip.mk
View File

@@ -33,22 +33,23 @@
CONTRIBDIR=ext/lwip-contrib CONTRIBDIR=ext/lwip-contrib
LWIPDIR=ext/lwip/src LWIPDIR=ext/lwip/src
CCDEP=clang++
# Automagically pick clang or gcc, with preference for clang # Automagically pick clang or gcc, with preference for clang
# This is only done if we have not overridden these with an environment or CLI variable # This is only done if we have not overridden these with an environment or CLI variable
ifeq ($(origin CC),default)
CC=$(shell if [ -e /usr/bin/clang ]; then echo clang; else echo gcc; fi)
endif
ifeq ($(origin CXX),default) ifeq ($(origin CXX),default)
CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi) CXX=$(shell if [ -e /usr/bin/clang++ ]; then echo clang++; else echo g++; fi)
endif endif
OSTYPE=$(shell uname -s | tr '[A-Z]' '[a-z]') OSTYPE=$(shell uname -s | tr '[A-Z]' '[a-z]')
BUILD=build/$(OSTYPE) BUILD=build/$(OSTYPE)
CCDEP=$(CXX)
CCX=clang++
# Windows # Windows
ifeq ($(OSTYPE),mingw32_nt-6.2) ifeq ($(OSTYPE),mingw32_nt-6.2)
CCX=g++ CXX=g++
WINDEFS=-Wno-c++11-compat -std=c++98 WINDEFS=-Wno-c++11-compat -std=c++98
LWIPARCH=$(CONTRIBDIR)/ports/win32 LWIPARCH=$(CONTRIBDIR)/ports/win32
endif endif
@@ -90,7 +91,7 @@ LWIPNOAPPSFILESW=$(wildcard $(LWIPNOAPPSFILES))
LWIPNOAPPSOBJS=$(notdir $(LWIPNOAPPSFILESW:.c=.o)) LWIPNOAPPSOBJS=$(notdir $(LWIPNOAPPSFILESW:.c=.o))
%.o: %.o:
$(CCX) $(CFLAGS) -c $(<:.o=.c) $(CXX) $(CFLAGS) -c $(<:.o=.c)
clean: clean:
rm -f *.o $(LWIPNOAPPSOBJS) *.s .depend* *.core core rm -f *.o $(LWIPNOAPPSOBJS) *.s .depend* *.core core
@@ -100,7 +101,7 @@ depend dep: .depend
include .depend include .depend
$(UNIXLIB): $(LWIPNOAPPSOBJS) $(UNIXLIB): $(LWIPNOAPPSOBJS)
$(CCX) $(CFLAGS) -g -nostartfiles -shared -o obj/$@ $^ $(CXX) $(CFLAGS) -g -nostartfiles -shared -o obj/$@ $^
.depend: $(LWIPNOAPPSFILES) .depend: $(LWIPNOAPPSFILES)
$(CCX) $(CFLAGS) -MM $^ > .depend || rm -f .depend $(CXX) $(CFLAGS) -MM $^ > .depend || rm -f .depend