diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 09:44:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-19 09:44:49 +0100 |
| commit | df23f6da3cb6dc12253dc864f0c56d149a339652 (patch) | |
| tree | 32d3a107d9d84b769e6c473286574d2599afc487 /mk | |
| parent | 289643bf8528175c8c16489400d04c479a7875d0 (diff) | |
| parent | 09981c6824ff47fa75ec4c17ca569bc92635996a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index ff9abd229..4cdccd8fd 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -98,7 +98,7 @@ POSTCONFIG= -@\ touch .rebuild.busybox;\ rebuild=1;\ fi; \ - for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_TARGET_QEMU_MICROBLAZE_MODEL;do \ + for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \ if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \ touch .rebuild.base-files;\ rebuild=1;\ diff --git a/mk/vars.mk b/mk/vars.mk index 699f3eda4..f22717c2e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -100,8 +100,7 @@ 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,-O1 -Wl,-rpath -Wl,/usr/lib \ - -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ - $(ADK_TARGET_ABI_LDFLAGS) + -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf TARGET_LDFLAGS+= -Wl,-z,relro,-z,now |