summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2015-09-26 21:25:55 +0300
committerIgor Pashev <pashev.igor@gmail.com>2015-09-26 21:25:55 +0300
commit9958e830c8d2de758726a60210eb5e6a92face6a (patch)
treefd70137088b08775656aa4a0ffeea1e205fe3201
parent26fbeaa041a3c27195a95834a00ed90b836a5291 (diff)
downloadgcc-5-9958e830c8d2de758726a60210eb5e6a92face6a.tar.gz
We do need libssp
-rw-r--r--debian/rules.conf3
-rw-r--r--debian/rules.defs3
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/rules.conf b/debian/rules.conf
index 0121284..680ede8 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -767,6 +767,9 @@ ifeq ($(with_libgomp),yes)
addons += $(if $(findstring armel,$(biarchhfarchs)),libhfgomp)
addons += $(if $(findstring armhf,$(biarchsfarchs)),libsfgomp)
endif
+ifeq ($(with_ssp),yes)
+ addons += libssp lib32ssp lib64ssp
+endif
ifeq ($(with_libitm),yes)
addons += libitm lib32itm lib64itm libn32itm
addons += $(if $(findstring amd64,$(biarchx32archs)),libx32itm)
diff --git a/debian/rules.defs b/debian/rules.defs
index ed0493a..cef7327 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1241,9 +1241,8 @@ else
# libssp ------------------
ifeq ($(with_ssp)-$(with_common_libs),yes-yes)
#ifneq ($(DEB_CROSS),yes)
- with_libssp := $(if $(wildcard $(builddir)/gcc/auto-host.h),$(shell if grep -qs '^\#define TARGET_LIBC_PROVIDES_SSP 1' $(builddir)/gcc/auto-host.h; then echo 'libc provides ssp'; else echo 'yes'; fi))
+ with_libssp := $(if $(wildcard $(builddir)/gcc/auto-host.h),$(shell if grep -qs '^\#define TARGET_LIBC_PROVIDES_SSP 1' $(builddir)/gcc/auto-host.h; then printf 'libc provides ssp'; else printf 'yes'; fi))
#endif
- with_libssp := libc provides ssp
endif
# libgomp -----------------