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 | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 13 | ||||
| -rw-r--r-- | mk/image.mk | 20 | ||||
| -rw-r--r-- | mk/vars.mk | 10 |
3 files changed, 18 insertions, 25 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; \ diff --git a/mk/image.mk b/mk/image.mk index 9c657d404..62ac155f8 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -64,8 +64,8 @@ endif ifeq ($(ADK_LINUX_X86_64),y) ifeq ($(ADK_TARGET_ABI_32),) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -75,8 +75,8 @@ endif endif ifeq ($(ADK_LINUX_PPC64),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -85,8 +85,8 @@ ifeq ($(ADK_LINUX_PPC64),y) endif ifeq ($(ADK_LINUX_SPARC64),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -95,8 +95,8 @@ ifeq ($(ADK_LINUX_SPARC64),y) endif ifeq ($(ADK_TARGET_ABI_N32),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} @@ -105,8 +105,8 @@ ifeq ($(ADK_TARGET_ABI_N32),y) endif ifeq ($(ADK_TARGET_ABI_N64),y) # fixup lib dirs - mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} - rm -rf ${TARGET_DIR}/lib/ + test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} + test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null -mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} diff --git a/mk/vars.mk b/mk/vars.mk index 30bf39247..12b26084d 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -113,13 +113,13 @@ TARGET_CXXFLAGS+= -static TARGET_LDFLAGS+= -static endif -ifneq ($(ADK_TOOLCHAIN_USE_SSP),) -TARGET_CFLAGS+= -fstack-protector -TARGET_CXXFLAGS+= -fstack-protector -TARGET_LDFLAGS+= -fstack-protector +ifneq ($(ADK_TARGET_USE_SSP),) +TARGET_CFLAGS+= -fstack-protector-all +TARGET_CXXFLAGS+= -fstack-protector-all +TARGET_LDFLAGS+= -fstack-protector-all endif -ifneq ($(ADK_TOOLCHAIN_USE_LTO),) +ifneq ($(ADK_TARGET_USE_LTO),) TARGET_CFLAGS+= -flto TARGET_CXXFLAGS+= -flto TARGET_LDFLAGS+= -flto |