upgrade to Time::Piece 1.15

[perl5.git] / cflags.SH

diff --git a/cflags.SH b/cflags.SH
index f8ad3ef..a5d71b9 100755 (executable)
--- a/cflags.SH
+++ b/cflags.SH
@@ -134,7 +134,7 @@ case "$gccversion" in
 '') ;;
 [12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
 Intel*) ;; # # Is that you, Intel C++?
-*)  for opt in -ansi -pedantic -std=c89 -W -Wextra -Wdeclaration-after-statement -Wendif-labels -Wc++-compat
+*)  for opt in -ansi -std=c89 -W -Wextra -Wdeclaration-after-statement -Wendif-labels -Wc++-compat
     do
        case " $ccflags " in
        *" $opt "*) ;; # Skip if already there.
@@ -183,7 +183,7 @@ case "$gccversion" in
     "long long")
        ccflags=`echo $ccflags|sed -e 's/-pedantic/ /' -e 's/-std=c89/ /' -e 's/-ansi/ /'`
        warn=`echo $warn|sed -e 's/-pedantic/ /' -e 's/-ansi/ /'`
-       stdflags=`echo $warn|sed -e 's/-std=c89/ /'`
+       stdflags=`echo $stdflags|sed -e 's/-std=c89/ /'`
        ;;
     esac
   fi
@@ -213,6 +213,8 @@ warn="$warn"
 stdflags="$stdflags"
 # Extra extra.
 extra="$extra"
+# what do executables look like?
+_exe="$_exe"
 
 !GROK!THIS!
 
@@ -317,46 +319,42 @@ for file do
     usersub) ;;
     utf8) ;;
     util) ;;
-    xsutils) ;;
     *) ;;
     esac
 
-case "$cc" in
-*g++*)
-  # Extra paranoia in case people have bad canned ccflags:
-  # bad in the sense that the flags are accepted by g++,
-  # but then whined about.
-  for f in -Wdeclaration-after-statement -std=c89
-  do
-    ccflags=`echo $ccflags|sed 's/$f/ /'`
-  done
-  ;;
-esac
-cppflags=`echo $cppflags|sed 's/-Wdeclaration-after-statement/ /'`
-
-case "$cc" in
-*g++*)
-  # Without -Wno-unused-variable g++ 4.x compiles are rather unwatchable
-  # because of all the warnings about Perl___notused, and g++ doesn't do
-  # __attribute__((unused)) (and even if at some stage it may, people do
-  # have older gcc installations), and ((void)x) isn't enough to silence
-  # the noises about XS functions not using their cv parameter, so we need
-  # the -Wno-unused-parameter too.
-  # Yes, we lose some valid warnings, but hopefully other compilers
-  # (like gcc) will still pick up those warnings.
-  for o in -Wno-unused-variable -Wno-unused-parameter
-  do
-    case "$warn" in
-    *$o*) ;;
-    *) warn="$warn $o" ;;
+    case "$cc" in
+    *g++*)
+      # Extra paranoia in case people have bad canned ccflags:
+      # bad in the sense that the flags are accepted by g++,
+      # but then whined about.
+      for f in -Wdeclaration-after-statement -std=c89
+      do
+        ccflags=`echo $ccflags|sed 's/$f/ /'`
+      done
+      ;;
+    esac
+    cppflags=`echo $cppflags|sed 's/-Wdeclaration-after-statement/ /'`
+
+    case "$cc" in
+    *g++*)
+      # Without -Wno-unused-variable g++ 4.x compiles are rather unwatchable
+      # because of all the warnings about Perl___notused, and g++ doesn't do
+      # __attribute__((unused)) (and even if at some stage it may, people do
+      # have older gcc installations), and ((void)x) isn't enough to silence
+      # the noises about XS functions not using their cv parameter, so we need
+      # the -Wno-unused-parameter too.
+      # Yes, we lose some valid warnings, but hopefully other compilers
+      # (like gcc) will still pick up those warnings.
+      for o in -Wno-unused-variable -Wno-unused-parameter
+      do
+        case "$warn" in
+        *$o*) ;;
+        *) warn="$warn $o" ;;
+        esac
+      done
+      ;;
     esac
-  done
-  ;;
-esac
 
-if test -f .patch; then
-  ccflags="-DPERL_PATCHNUM=`cat .patch` $ccflags"
-fi
 
     : Can we perhaps use $ansi2knr here
     echo "$cc -c -DPERL_CORE $ccflags $stdflags $optimize $warn $extra"
@@ -364,6 +362,7 @@ fi
 
     . $TOP/config.sh
 
+    # end per file behaviour
 done
 !NO!SUBS!
 chmod 755 cflags