summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorChristian Ambach <ambi@samba.org>2013-05-07 09:06:50 +0200
committerChristian Ambach <ambi@samba.org>2013-05-17 11:16:33 +0200
commit162ec83f68efc89c46630f6842700bca8f16b201 (patch)
treea354b936a5f920e3bd854d37d49bdbd3a8237aaa /lib
parent355f78fe9e8ba09179693597104915f3b6963139 (diff)
downloadsamba-162ec83f68efc89c46630f6842700bca8f16b201.tar.gz
samba-162ec83f68efc89c46630f6842700bca8f16b201.tar.bz2
samba-162ec83f68efc89c46630f6842700bca8f16b201.zip
waf: only use -fstack-protector when both compiler and linker support it
otherwise build with xlc on AIX fails because the compiler silently ignores the parameter but the linker does not like it Signed-off-by: Christian Ambach <ambi@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/replace/wscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 9483e23089..bc45ee9043 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -53,7 +53,7 @@ struct foo bar = { .y = 'X', .x = 1 };
conf.ADD_CFLAGS(f)
break
- if conf.CHECK_CFLAGS(['-fstack-protector']):
+ if conf.CHECK_CFLAGS(['-fstack-protector']) and conf.CHECK_LDFLAGS(['-fstack-protector']):
conf.ADD_CFLAGS('-fstack-protector')
conf.ADD_LDFLAGS('-fstack-protector')