diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildhlp.mk | 2 | ||||
| -rw-r--r-- | mk/package.mk | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index afad521e2..684801617 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -88,7 +88,7 @@ endif ${BASH} ${TOPDIR}/scripts/update-patches); \ if [[ -n $$toedit && $$toedit != FAIL ]]; then \ echo -n 'edit patches: '; read i; \ - cd patches && $${VISUAL:-$${EDITOR:-/usr/bin/vi}} $$toedit; \ + cd patches && $${VISUAL:-$${EDITOR:-vi}} $$toedit; \ fi; \ rm -rf ${WRKDIR}.orig; \ [[ $$toedit != FAIL ]] diff --git a/mk/package.mk b/mk/package.mk index a9339b811..64884e4b4 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -7,17 +7,23 @@ ifeq ($(ADK_STATIC),y) TCFLAGS:= ${TARGET_CFLAGS} -static TCXXFLAGS:= ${TARGET_CFLAGS} -static TCPPFLAGS:= ${TARGET_CPPFLAGS} -static +ifeq ($(ADK_NATIVE),y) +TCFLAGS:= +TCXXFLAGS:= +TCPPFLAGS:= +TLDFLAGS:= else TCFLAGS:= ${TARGET_CFLAGS} TCXXFLAGS:= ${TARGET_CFLAGS} TCPPFLAGS:= ${TARGET_CPPFLAGS} +TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \ + -Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \ + -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib +endif endif ifeq ($(ADK_DEBUG),) TCPPFLAGS+= -DNDEBUG endif -TLDFLAGS:= ${TARGET_LDFLAGS} -Wl,-rpath -Wl,/usr/lib \ - -Wl,-rpath-link -Wl,${STAGING_DIR}/usr/lib \ - -L${STAGING_DIR}/lib -L${STAGING_DIR}/usr/lib ifneq ($(ADK_DEBUG),) CONFIGURE_ARGS+= --enable-debug else @@ -30,7 +36,11 @@ CONFIGURE_ARGS+= --disable-ipv6 endif ifeq ($(ADK_NATIVE),y) - CONFIG_SHELL='$(strip ${SHELL})' +CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ + CFLAGS='$(strip ${TCFLAGS})' \ + CXXFLAGS='$(strip ${TCXXFLAGS})' \ + CPPFLAGS='$(strip ${TCPPFLAGS})' \ + LDFLAGS='$(strip ${TLDFLAGS})' else CONFIGURE_ENV+= ${TARGET_CONFIGURE_OPTS} \ ${HOST_CONFIGURE_OPTS} \ @@ -59,7 +69,11 @@ INSTALL_TARGET?= install ifeq ($(ADK_NATIVE),y) MAKE_ENV+= \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ - WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' + WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ + CFLAGS='$(strip ${TCFLAGS})' \ + CXXFLAGS='$(strip ${TCXXFLAGS})' \ + CPPFLAGS='$(strip ${TCPPFLAGS})' \ + LDFLAGS='$(strip ${TLDFLAGS})' else MAKE_ENV+= PATH='${TARGET_PATH}' \ ${HOST_CONFIGURE_OPTS} \ |