From 52705fa6f0e093bcde34f79ebc690b87504bf712 Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Wed, 17 Feb 2016 10:08:33 -0500
Subject: [svn-r29139] Updated PGI compiler files to set
 NO_SYMBOLS_CFLAGS/FCFLAGS and moved the -s (strip symbols) option from the
 production flags to the no symbols flags.

Tested on: platypus w/ PGI 15.7 (C, C++, Fortran)
---
 config/pgi-fflags |  3 ++-
 config/pgi-flags  | 12 ++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/config/pgi-fflags b/config/pgi-fflags
index fbcba52..08dfe6e 100644
--- a/config/pgi-fflags
+++ b/config/pgi-fflags
@@ -84,13 +84,14 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
     #else
     #    PROD_FCFLAGS="-O2 -s"
     #fi
-    PROD_FCFLAGS="-fast -s -Mnoframe"
+    PROD_FCFLAGS="-fast -Mnoframe"
 
     # Debug
     DEBUG_FCFLAGS="-Mbounds -Mchkptr -Mdclchk"
 
     # Symbols
     SYMBOLS_FCFLAGS="-g"
+    NO_SYMBOLS_FCFLAGS="-s"
 
     # Profiling
     PROFILE_FCFLAGS="-Mprof=func,line"
diff --git a/config/pgi-flags b/config/pgi-flags
index a6dcba3..f6878e6 100644
--- a/config/pgi-flags
+++ b/config/pgi-flags
@@ -73,31 +73,28 @@ if test "X-pgcc" = "X-$cc_vendor"; then
     # Production
     case "$cc_vendor-$cc_version" in
       pgcc-10.6*)
-        PROD_CFLAGS="-s"
+        PROD_CFLAGS=
         ;;
       pgcc-9.*)
-        PROD_CFLAGS="-s"
+        PROD_CFLAGS=
         ;;
       *)
-        PROD_CFLAGS="-fast -s"
+        PROD_CFLAGS="-fast"
         ;;
     esac
-    PROD_CPPFLAGS=
 
     # Debug
     # NDEBUG is handled explicitly by the configure script
     DEBUG_CFLAGS="-Mbounds"
-    DEBUG_CPPFLAGS=
 
     # Symbols
     SYMBOLS_CFLAGS="-g"
-    SYMBOLS_CPPFLAGS=
+    NO_SYMBOLS_CFLAGS="-s"
 
     # Profiling
     PROFILE_CFLAGS="-Mprof=func,line"
     # Use this for profiling with gprof
     #PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
 
     # Optimization
     case "$cc_vendor-$cc_version" in
@@ -118,7 +115,6 @@ if test "X-pgcc" = "X-$cc_vendor"; then
 
     # Flags are set
     cc_flags_set=yes
-
 fi
 
 # Clear cc info if no flags set
-- 
cgit v0.12