diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 12:48:01 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 12:48:01 +0100 |
commit | 3fe732e577313be28abbb99a636779a9debe400c (patch) | |
tree | d37f3e105c10037db1cc82596462c85e0902ad12 /mk/package.mk | |
parent | 0e8c55d0649610a3848bac209ac5054701869e52 (diff) | |
parent | 5101b72fac2c9a6971a0c7d2fe6bbd318e9678ab (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk/package.mk')
-rw-r--r-- | mk/package.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/mk/package.mk b/mk/package.mk index d5d48c1e1..8439d88eb 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -25,13 +25,12 @@ CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \ CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \ CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \ LDFLAGS='$(strip ${TARGET_LDFLAGS})' \ - ${HOST_CONFIGURE_OPTS} \ PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \ ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes -ifeq ($(ADK_NATIVE),) -CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} cross_compiling=yes -endif + ac_cv_func_malloc_0_nonnull=yes \ + cross_compiling=yes \ + ${HOST_CONFIGURE_OPTS} \ + ${TARGET_CONFIGURE_OPTS} CONFIGURE_PROG?= configure MAKE_FILE?= Makefile @@ -57,12 +56,8 @@ MAKE_ENV+= $(GCC_CHECK) \ CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \ LDFLAGS='$(strip ${TARGET_LDFLAGS})' \ ${HOST_CONFIGURE_OPTS} \ - PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' -ifeq ($(ADK_NATIVE),) -MAKE_ENV+= ${TARGET_CONFIGURE_OPTS} -else -MAKE_ENV+= M4=m4 -endif + PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig' \ + ${TARGET_CONFIGURE_OPTS} MAKE_FLAGS+= ${XAKE_FLAGS} V=1 FAKE_FLAGS+= ${XAKE_FLAGS} |