diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
| commit | b708ee58f7bef7b479f5b6999a8e976d332691b6 (patch) | |
| tree | 4b13e9706173c676a0278ca1f565bc54b41943a2 /mk | |
| parent | f3cc98651b738ac7f2dc56ea772afa9f874b9d3b (diff) | |
| parent | 7c1f6387d20faf69453a59de6c34227f9f2b833c (diff) | |
resolve merge
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | mk/buildhlp.mk | 4 | ||||
| -rw-r--r-- | mk/vars.mk | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/mk/build.mk b/mk/build.mk index af1313206..2573027e7 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -41,8 +41,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_TEST=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_TOOLCHAIN_GCC_USE_SSP=n \ - ADK_TOOLCHAIN_GCC_USE_LTO=n \ + ADK_TOOLCHAIN_USE_SSP=n \ + ADK_TOOLCHAIN_USE_LTO=n \ + ADK_TOOLCHAIN_USE_GOLD=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ BUSYBOX_FEATURE_IFCONFIG_SLIP=n \ diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 5ce3ca4a0..c8acd2ae6 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -72,9 +72,9 @@ ifeq ($(strip ${__use_generic_patch_target}),42) post-patch: ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done [ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches/${PKG_VERSION} \ - '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) + '{patch-!(*.orig),*.patch,*.${ARCH}}' $(MAKE_TRACE) [ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ - '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) + '{patch-!(*.orig),*.patch,*.${ARCH}}' $(MAKE_TRACE) [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ $(MAKE_TRACE) @${MAKE} post-patch $(MAKE_TRACE) diff --git a/mk/vars.mk b/mk/vars.mk index e804ad5e6..2f2ecc134 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -111,13 +111,19 @@ TARGET_LDFLAGS+= -Wl,--secure-plt endif endif -ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) +ifeq ($(ADK_STATIC),y) +TARGET_CFLAGS+= -static +TARGET_CXXFLAGS+= -static +TARGET_LDFLAGS+= -static +endif + +ifneq ($(ADK_TOOLCHAIN_USE_SSP),) TARGET_CFLAGS+= -fstack-protector TARGET_CXXFLAGS+= -fstack-protector TARGET_LDFLAGS+= -fstack-protector endif -ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),) +ifneq ($(ADK_TOOLCHAIN_USE_LTO),) TARGET_CFLAGS+= -flto TARGET_CXXFLAGS+= -flto TARGET_LDFLAGS+= -flto |