diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 15:48:24 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 15:48:24 +0200 |
| commit | 7c1f6387d20faf69453a59de6c34227f9f2b833c (patch) | |
| tree | 10036b326525db316f614baefaaf5932d1f8e3cc /mk | |
| parent | 3a00a860d7d26282b5645992559fdb52f3c58fbf (diff) | |
| parent | d63d9df8e5c245214fbd94856773eba4b0c731cf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
2 files changed, 5 insertions, 4 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/vars.mk b/mk/vars.mk index 49eb3e7e3..2f2ecc134 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -117,13 +117,13 @@ TARGET_CXXFLAGS+= -static TARGET_LDFLAGS+= -static endif -ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) +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 |