summaryrefslogtreecommitdiff
path: root/package/zlib/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-06 12:27:17 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-06 12:27:17 +0100
commit7f853c20b539d4b71e6d0ef53fcc16d7b9c00976 (patch)
tree741b4dec89a982349c3c632e0c57ebc9a1461deb /package/zlib/Makefile
parent448a4dad384ca81784f7fa65d7f708ecae1a02a6 (diff)
parent0e0a2444db5dd41d5cec523ce183ace747fcfc74 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/zlib/Makefile')
-rw-r--r--package/zlib/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 1d1c0d57c..6fe11ae3d 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -26,10 +26,6 @@ $(eval $(call PKG_template,ZLIB,zlib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
CONFIG_STYLE:= manual
CONFIGURE_ENV+= uname=Linux
-ifeq ($(ADK_NATIVE),)
-COPTS:= $(TARGET_CONFIGURE_OPTS)
-endif
-
ifeq ($(ADK_STATIC),)
CONFIGURE_OPTS:= --shared
endif
@@ -37,8 +33,9 @@ endif
ALL_TARGET:= libz.a libz.so.$(PKG_VERSION)
do-configure:
- (cd $(WRKBUILD); $(COPTS) \
+ (cd $(WRKBUILD); \
uname="Linux" \
+ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -fPIC" \
CPPFLAGS="-I$(STAGING_TARGET_DIR)/usr/include" \
LDFLAGS="-L$(STAGING_TARGET_DIR)/usr/lib" \