diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-10 10:54:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-10 10:54:20 +0200 |
| commit | 581c747ae157d8802dc704786eaceb648da79e28 (patch) | |
| tree | b9d69fbf40a85e876cde9738e04c5f1ea524486d /mk | |
| parent | 6916a7793d864f5dcb661bb059a4f99afa1ee433 (diff) | |
fix 32 Bit multilib builds
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/toolchain.mk | 1 | ||||
| -rw-r--r-- | mk/vars.mk | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index 0ad4ea788..fa2e21fd5 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -158,12 +158,12 @@ ifeq ($(ADK_NATIVE),y) else ifeq ($(ADK_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile + $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile root_clean package/install + $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install endif else - $(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif diff --git a/mk/toolchain.mk b/mk/toolchain.mk index 6a181a444..80860a0f1 100644 --- a/mk/toolchain.mk +++ b/mk/toolchain.mk @@ -2,5 +2,6 @@ prepare: ${WRKDIST}/.prepared $(WRKBUILD)/.headers configure: ${WRKBUILD}/.configured compile: $(WRKBUILD)/.compiled install: $(WRKBUILD)/.installed +fixup: $(WRKBUILD)/.fixup clean: rm -rf $(WRKDIR) diff --git a/mk/vars.mk b/mk/vars.mk index bdfd333ad..6fc2eb192 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -99,7 +99,8 @@ TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ - -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib + -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ + $(ADK_TARGET_ABI_LDFLAGS) ifneq ($(ADK_NATIVE),) TARGET_CPPFLAGS:= |