diff options
| -rw-r--r-- | package/zlib/Makefile | 9 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 1428154c2..1f0e11ef6 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= zlib PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6 PKG_DESCR:= implementation of the deflate compression method (library) PKG_SECTION:= libs @@ -24,9 +24,12 @@ CONFIGURE_STYLE= manual BUILD_STYLE= auto INSTALL_STYLE= auto +ifeq ($(ADK_NATIVE),n) +COPTS:= $(TARGET_CONFIGURE_OPTS) +endif + do-configure: - (cd $(WRKBUILD); \ - $(TARGET_CONFIGURE_OPTS) \ + (cd $(WRKBUILD); $(COPTS) \ CFLAGS="$(TARGET_CFLAGS) -fPIC" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index baf60775f..210c0f68a 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -130,7 +130,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH=$(TARGET_PATH) \ $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install # workaround if you cross-compile binutils - rm $(STAGING_DIR)/lib/libiberty.a + @-rm $(STAGING_DIR)/lib/libiberty.a # Set up the symlinks to enable lying about target name. set -e; \ (cd $(STAGING_TOOLS); \ |