[lintian] 01/01: t: Fix pie/no-pie hacks to work with old toolchains
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit e0e8a6a997585a9a479e58769674c848137e610f
Author: Adam Conrad <adconrad@0c3.net>
Date: Sat Jul 9 13:33:02 2016 +0000
t: Fix pie/no-pie hacks to work with old toolchains
Signed-off-by: Adam Conrad <adconrad@0c3.net>
Signed-off-by: Niels Thykier <niels@thykier.net>
---
t/tests/binaries-general/debian/Makefile | 6 +++++-
t/tests/binaries-hardening/debian/Makefile | 6 +++++-
t/tests/binaries-libc-link/debian/Makefile | 6 +++++-
t/tests/legacy-debug/debian/debian/rules | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/t/tests/binaries-general/debian/Makefile b/t/tests/binaries-general/debian/Makefile
index 1a90284..cf0f211 100644
--- a/t/tests/binaries-general/debian/Makefile
+++ b/t/tests/binaries-general/debian/Makefile
@@ -1,5 +1,9 @@
# turn off PIE in CC in case we have a PIEful toolchain:
-CC := gcc -fno-pie -no-pie
+ifneq ($(findstring -no-pie,$(shell gcc -no-pie 2>&1)),)
+ CC := gcc
+else
+ CC := gcc -fno-pie -no-pie
+endif
NOPIE_CFLAGS = $(filter-out -fPIE,$(CFLAGS))
NOPIE_LDFLAGS = $(filter-out -fPIE -pie,$(LDFLAGS))
diff --git a/t/tests/binaries-hardening/debian/Makefile b/t/tests/binaries-hardening/debian/Makefile
index 0a9b764..e0884fd 100644
--- a/t/tests/binaries-hardening/debian/Makefile
+++ b/t/tests/binaries-hardening/debian/Makefile
@@ -1,5 +1,9 @@
# turn off PIE in CC in case we have a PIEful toolchain:
-CC := gcc -fno-pie -no-pie
+ifneq ($(findstring -no-pie,$(shell gcc -no-pie 2>&1)),)
+ CC := gcc
+else
+ CC := gcc -fno-pie -no-pie
+endif
all: weak.1 strong.1
# Build without dpkg-buildflags.
diff --git a/t/tests/binaries-libc-link/debian/Makefile b/t/tests/binaries-libc-link/debian/Makefile
index ed35a20..daa4159 100644
--- a/t/tests/binaries-libc-link/debian/Makefile
+++ b/t/tests/binaries-libc-link/debian/Makefile
@@ -1,5 +1,9 @@
# turn off PIE in CC in case we have a PIEful toolchain:
-CC := gcc -fno-pie -no-pie
+ifneq ($(findstring -no-pie,$(shell gcc -no-pie 2>&1)),)
+ CC := gcc
+else
+ CC := gcc -fno-pie -no-pie
+endif
LINKER_FLAGS := -Wl,--no-copy-dt-needed-entries,--no-as-needed
diff --git a/t/tests/legacy-debug/debian/debian/rules b/t/tests/legacy-debug/debian/debian/rules
index 4b1ac55..f76ef28 100755
--- a/t/tests/legacy-debug/debian/debian/rules
+++ b/t/tests/legacy-debug/debian/debian/rules
@@ -5,7 +5,11 @@
#export DH_COMPAT := 5
# turn off PIE in CC in case we have a PIEful toolchain:
-CC := gcc -fno-pie -no-pie
+ifneq ($(findstring -no-pie,$(shell gcc -no-pie 2>&1)),)
+ CC := gcc
+else
+ CC := gcc -fno-pie -no-pie
+endif
build-indep:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: