summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2012-09-30 00:06:37 +0000
committerPeter Eisentraut2012-09-30 00:07:36 +0000
commit97ec9621572054be96b0447395f5fa2438a4d6cb (patch)
tree9fe269cd0362387cbf3e1ddf0dcfd08762a20f94
parentff75219e9f58f0cee1578e6d4175fe36b6bab3e3 (diff)
Disable _FORTIFY_SOURCE with ICC
There are apparently some incompatibilities, per buildfarm.
-rw-r--r--src/template/linux7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/template/linux b/src/template/linux
index b3ad4fabba..fd509d98ca 100644
--- a/src/template/linux
+++ b/src/template/linux
@@ -3,8 +3,11 @@
# Force _GNU_SOURCE on; plperl is broken with Perl 5.8.0 otherwise
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-# Many distributors use this, so we might as well see the warnings as well.
-CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+# Many distributors use this, so we might as well see the warnings as
+# well. ICC doesn't work when this is enabled.
+if test "$ICC" != "yes"; then
+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+fi
# If --enable-profiling is specified, we need -DLINUX_PROFILE
PLATFORM_PROFILE_FLAGS="-DLINUX_PROFILE"