From 57d2761b46edd92efa00f984cb9840506d3b6483 Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 16 Jun 2014 08:32:48 -0400
Subject: Allow cflags.SH edits to ccflags to stick.

---
 cflags.SH | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'cflags.SH')

diff --git a/cflags.SH b/cflags.SH
index 524dab15ad..f9a3838d2e 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -176,10 +176,6 @@ Intel*) ;; # # Is that you, Intel C++?
 esac
 rm -f _cflags.c _cflags$_exe
 
-# XXX There is something wrong in the below: furious editing on ccflags,
-# but that ccflags will be overwritten by the source of config.sh in the
-# extracted cflags.
-
 case "$gccversion" in
 '') ;;
 *)
@@ -231,7 +227,8 @@ $startsh
 
 # This file is generated by cflags.SH
 
-
+# Base flags.  myccflags so that the possible edits by cflags.SH will stick.
+myccflags="$ccflags"
 # Extra warnings, used e.g. for gcc.
 warn="$warn"
 # Extra standardness.
@@ -256,6 +253,7 @@ case $PERL_CONFIG_SH in
 		echo "Can't find config.sh."; exit 1
 	fi
 	. $TOP/config.sh
+        ccflags="$myccflags"  # Restore possible edits by cflags.SH.
 	;;
 esac
 
-- 
cgit v1.2.1