summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorThibault DUPONCHELLE <thibault.duponchelle@gmail.com>2020-06-12 14:19:52 +0200
committerℕicolas ℝ <nicolas@atoomic.org>2020-09-29 10:11:41 -0600
commit6b6e83fce2074294ac11d547c8a75bc106bebab9 (patch)
tree5e7ff6198fa105ccd4053a6b692d1e4b46f4db3a /Configure
parent941f2f38259a2fa17ca703554d5158c5435d7fc5 (diff)
downloadperl-6b6e83fce2074294ac11d547c8a75bc106bebab9.tar.gz
Fix build on Haiku beta, set correct Haiku usrinc and locinc, add -fno-stack-protector to hints for amigaos.sh
and haiku.sh (and disable accordingly -fstack-protector* in Configure)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure29
1 files changed, 15 insertions, 14 deletions
diff --git a/Configure b/Configure
index e98c4d1f63..16d63709ee 100755
--- a/Configure
+++ b/Configure
@@ -5388,23 +5388,24 @@ default|recommended)
# is to add the flag to the flags passed to the compiler at link time,
# as that way the compiler can do the right implementation dependant
# thing. (NWC)
- case "$osname" in
- amigaos) ;; # -fstack-protector builds but doesn't work
- *) case "$gccversion" in
- ?*) set stack-protector-strong -fstack-protector-strong
- eval $checkccflag
- case "$dflt" in
- *-fstack-protector-strong*) ;; # It got added.
- *) # Try the plain/older -fstack-protector.
- set stack-protector -fstack-protector
- eval $checkccflag
- ;;
- esac
- ;;
+ case "$ccflags" in
+ *-fno-stack-protector*)
+ echo "Do not add -fstack-protector nor -fstack-protector-strong" 2>&1
+ ;;
+ *) case "$gccversion" in
+ ?*) set stack-protector-strong -fstack-protector-strong
+ eval $checkccflag
+ case "$dflt" in
+ *-fstack-protector-strong*) ;; # It got added.
+ *) # Try the plain/older -fstack-protector.
+ set stack-protector -fstack-protector
+ eval $checkccflag
+ ;;
esac
;;
+ esac
+ ;;
esac
- ;;
esac
case "$mips_type" in