diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 16:08:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-24 16:08:45 +0100 |
| commit | 576d781cf21104289e890193b263a7808b8694ac (patch) | |
| tree | f8dd78959a68bcf278449a08ad16493988015a7c /toolchain | |
| parent | 7a3d35176e952c9e3f40b70b78186cd1cb68d39f (diff) | |
| parent | 850ed0a79fd5c91ac6d037b151cd6ce314a3871f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/musl/Makefile | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 6f70bfd12..5595f82dd 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -28,7 +28,7 @@ GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \ --disable-libstdcxx-pch \ --disable-ppl-version-check \ --disable-cloog-version-check \ - --without-system-zlib \ + --with-system-zlib \ --without-ppl \ --without-cloog \ --without-isl \ diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 6701c502a..7b0eeb104 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -12,6 +12,7 @@ endif $(WRKBUILD)/.headers: (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ + CFLAGS='$(TARGET_CFLAGS)' \ ./configure --prefix=/usr \ --target=$(GNU_TARGET_NAME) \ --disable-gcc-wrapper \ @@ -22,29 +23,31 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.compiled: # reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled - $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean + $(MAKE) -C $(WRKBUILD) clean (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ + CFLAGS='$(TARGET_CFLAGS)' \ ./configure --prefix=/usr \ --target=$(GNU_TARGET_NAME) \ --disable-gcc-wrapper \ ) - $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all + $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled - $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install + $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install touch $@ $(WRKBUILD)/.fixup: # reconfigure musl, otherwise linking with libgcc or libgcc_eh is disabled - $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean + $(MAKE) -C $(WRKBUILD) clean (cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \ + CFLAGS='$(TARGET_CFLAGS)' \ ./configure --prefix=/usr \ --target=$(GNU_TARGET_NAME) \ --disable-gcc-wrapper \ ) - $(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all - $(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install + $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' all + $(MAKE) -C $(WRKBUILD) CFLAGS='$(TARGET_CFLAGS)' DESTDIR=$(STAGING_TARGET_DIR) install # cleanup toolchain -find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete ifeq ($(ADK_TOOLCHAIN),y) |