From 6b6e83fce2074294ac11d547c8a75bc106bebab9 Mon Sep 17 00:00:00 2001
From: Thibault DUPONCHELLE <thibault.duponchelle@gmail.com>
Date: Fri, 12 Jun 2020 14:19:52 +0200
Subject: 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)

---
 Configure | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'Configure')

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
-- 
cgit v1.2.1