diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /mk/build.mk | |
parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) |
resolve merge conflict
Diffstat (limited to 'mk/build.mk')
-rw-r--r-- | mk/build.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/mk/build.mk b/mk/build.mk index b59fa65f1..98f5ce3ee 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -35,10 +35,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_TEST=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_TOOLCHAIN_USE_SSP=n \ - ADK_TOOLCHAIN_USE_LTO=n \ - ADK_TOOLCHAIN_GOLD=n \ - ADK_TOOLCHAIN_USE_GOLD=n \ + ADK_TOOLCHAIN_WITH_SSP=n \ + ADK_TOOLCHAIN_WITH_LTO=n \ + ADK_TOOLCHAIN_WITH_GOLD=n \ ADK_LINUX_ARM_WITH_THUMB=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ @@ -114,12 +113,6 @@ POSTCONFIG= -@\ touch .rebuild.bkeymaps;\ rebuild=1;\ fi; \ - if [ "$$(grep ^ADK_KERNEL_VERSION_ .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION_ .config.old|md5sum)" ];then \ - make kernelclean;\ - fi; \ - if [ "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config|md5sum)" != "$$(grep ^ADK_LINUX_ARM_WITH_THUMB .config.old|md5sum)" ];then \ - echo "You should make cleandir, after changing thumb mode";\ - fi; \ if [ $$rebuild -eq 1 ];then \ cp .config .config.old;\ fi; \ |