summaryrefslogtreecommitdiff
path: root/mk/package.mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk/package.mk')
-rw-r--r--mk/package.mk34
1 files changed, 9 insertions, 25 deletions
diff --git a/mk/package.mk b/mk/package.mk
index 32dc5464d..f397974d8 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -43,28 +43,19 @@ else
CONFIGURE_ARGS+= --disable-debug
endif
-ifeq ($(ADK_NATIVE),y)
CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \
- SHELL='$(strip ${SHELL})' \
CFLAGS='$(strip ${TCFLAGS})' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
LDFLAGS='$(strip ${TLDFLAGS})' \
- PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
- PKG_CONFIG_LIBDIR=/dev/null
-else
+ PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig'
+ifeq ($(ADK_NATIVE),)
CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \
${HOST_CONFIGURE_OPTS} \
- CFLAGS='$(strip ${TCFLAGS})' \
- CXXFLAGS='$(strip ${TCXXFLAGS})' \
- CPPFLAGS='$(strip ${TCPPFLAGS})' \
- LDFLAGS='$(strip ${TLDFLAGS})' \
- PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
- PKG_CONFIG_LIBDIR=/dev/null \
- CONFIG_SHELL='$(strip ${SHELL})' \
ac_cv_func_realloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes
endif
+
CONFIGURE_PROG?= configure
MAKE_FILE?= Makefile
# this is environment for 'make all' and 'make install'
@@ -77,33 +68,26 @@ MAKE_FLAGS?=
FAKE_FLAGS?=
ALL_TARGET?= all
INSTALL_TARGET?= install
-ifeq ($(ADK_NATIVE),y)
-MAKE_ENV+= \
- WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
+
+MAKE_ENV+= WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
CFLAGS='$(strip ${TCFLAGS})' \
CXXFLAGS='$(strip ${TCXXFLAGS})' \
CPPFLAGS='$(strip ${TCPPFLAGS})' \
LDFLAGS='$(strip ${TLDFLAGS})'
-else
+ifeq ($(ADK_NATIVE),)
MAKE_ENV+= PATH='${TARGET_PATH}' \
${HOST_CONFIGURE_OPTS} \
- WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \
- WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \
- PKG_CONFIG_PATH='${STAGING_DIR}/usr/lib/pkgconfig' \
- PKG_CONFIG_LIBDIR=/dev/null \
+ PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig' \
CC='${TARGET_CC}' \
CXX='${TARGET_CXX}' \
AR='${TARGET_CROSS}ar' \
RANLIB='${TARGET_CROSS}ranlib' \
NM='${TARGET_CROSS}nm' \
STRIP='${TARGET_CROSS}strip' \
- CROSS="$(TARGET_CROSS)" \
- CFLAGS='$(strip ${TCFLAGS})' \
- CXXFLAGS='$(strip ${TCXXFLAGS})' \
- CPPFLAGS='$(strip ${TCPPFLAGS})' \
- LDFLAGS='$(strip ${TLDFLAGS})'
+ CROSS="$(TARGET_CROSS)"
endif
+
MAKE_FLAGS+= ${XAKE_FLAGS} V=1
FAKE_FLAGS+= ${XAKE_FLAGS}