diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-08-05 10:10:21 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-08-05 10:10:25 +0200 |
| commit | ff1d511b58f833bbfbc846c87affe90180c83fe0 (patch) | |
| tree | 71ddfc90243ee962b37a3986843fc30a70029215 | |
| parent | ee77b8107a16aedfa24275d705fe6d1f4fa43c8d (diff) | |
clang does not know -static-libgcc on Darwin
| -rw-r--r-- | adk/config/Makefile | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 9 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/adk/config/Makefile b/adk/config/Makefile index 1b2b3d2c5..8eb45f5c0 100644 --- a/adk/config/Makefile +++ b/adk/config/Makefile @@ -6,7 +6,7 @@ include ${ADK_TOPDIR}/rules.mk endif CP=cp -fpR -HOST_CFLAGS:=-DKBUILD_NO_NLS -O0 -g0 -w -static-libgcc +HOST_CFLAGS+=-DKBUILD_NO_NLS -w all: ncurses conf mconf diff --git a/mk/vars.mk b/mk/vars.mk index cd2cc61fa..043611a1b 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -186,10 +186,15 @@ endif # host compiler and linker flags HOST_CPPFLAGS:= -I$(STAGING_HOST_DIR)/usr/include -HOST_CFLAGS:= -O0 -g0 -static-libgcc -HOST_CXXFLAGS:= -O0 -g0 -static-libgcc +HOST_CFLAGS:= -O0 -g0 +HOST_CXXFLAGS:= -O0 -g0 HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib -static-libgcc +ifeq ($(ADK_HOST_DARWIN),) +HOST_CFLAGS+= -static-libgcc +HOST_CXXFLAGS+= -static-libgcc +endif + PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh PATCHP0= PATH=${HOST_PATH} patch -p0 diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 988c9cceb..d2ed0e2f2 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -5,6 +5,7 @@ shopt -s extglob topdir=$(pwd) opath=$PATH out=0 +clang=0 if [[ $NO_ERROR != @(0|1) ]]; then echo Please do not invoke this script directly! @@ -60,6 +61,7 @@ OpenBSD) fi ;; Darwin*) + clang=1 ;; *) # unsupported @@ -77,12 +79,16 @@ else makecmd=$(which gmake 2>/dev/null ) fi +if [ $clang -ne 1 ];then +HCFLAGS=-static-libgcc +fi + cat >Makefile <<'EOF' include ${ADK_TOPDIR}/prereq.mk all: run-test test: test.c - ${HOST_CC} -static-libgcc -o $@ $^ ${LDADD} + ${HOST_CC} $(HCFLAGS) -o $@ $^ ${LDADD} run-test: test ./test |