diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/dec-flags | 2 | ||||
-rw-r--r-- | config/hpux10.20 | 2 | ||||
-rw-r--r-- | config/hpux11.00 | 6 | ||||
-rw-r--r-- | config/ia64-linux-gnu | 5 | ||||
-rw-r--r-- | config/irix6.x | 4 | ||||
-rw-r--r-- | config/linux-gnulibc1 | 2 | ||||
-rw-r--r-- | config/powerpc-ibm-aix4.x | 2 | ||||
-rw-r--r-- | config/powerpc-ibm-aix5.x | 2 | ||||
-rw-r--r-- | config/rs6000-ibm-aix4.x | 2 | ||||
-rw-r--r-- | config/solaris2.x | 8 | ||||
-rw-r--r-- | config/sv1-cray | 2 | ||||
-rw-r--r-- | config/unicos | 2 | ||||
-rw-r--r-- | config/unicos10.0.X | 2 | ||||
-rw-r--r-- | config/unicosmk | 2 | ||||
-rw-r--r-- | config/unicosmk2.0.5.X | 2 | ||||
-rw-r--r-- | config/unicosmk2.0.6.X | 2 | ||||
-rw-r--r-- | config/unicosmk2.0.X | 2 |
17 files changed, 25 insertions, 24 deletions
diff --git a/config/dec-flags b/config/dec-flags index 33924ee..d35dee8 100644 --- a/config/dec-flags +++ b/config/dec-flags @@ -86,7 +86,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-Olimit 2048 -std1" + FFLAGS="$FFLAGS -Olimit 2048 -std1" DEBUG_FFLAGS="-Olimit 2048 -std1" PROD_FFLAGS="-Olimit 2048 -std1" PROFILE_FFLAGS="-Olimit 2048 -std1" diff --git a/config/hpux10.20 b/config/hpux10.20 index a8f22b5..e37c0d3 100644 --- a/config/hpux10.20 +++ b/config/hpux10.20 @@ -60,7 +60,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-O" + FFLAGS="$FFLAGS -O" DEBUG_FFLAGS="-O" PROD_FFLAGS="-O" PROFILE_FFLAGS="-O" diff --git a/config/hpux11.00 b/config/hpux11.00 index c8d69b3..6fd2ccc 100644 --- a/config/hpux11.00 +++ b/config/hpux11.00 @@ -60,7 +60,7 @@ fi if test "X$f9x_flags_set" = "X"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-O" + FFLAGS="$FFLAGS -O" DEBUG_FFLAGS="-O" PROD_FFLAGS="-O" PROFILE_FFLAGS="-O" @@ -76,8 +76,8 @@ fi if test -z "$cxx_flags_set"; then # +Z for PIC, +A for using archived libraries - CXXFLAGS="+Z +A" - CFLAGS="-g +O2" + CXXFLAGS="$CXXFLAGS +Z +A" + CFLAGS="$CFLAGS -g +O2" DEBUG_CXXFLAGS=-g DEBUG_CPPFLAGS= PROD_CXXFLAGS="-O -s" diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu index 490db5f..baea81f 100644 --- a/config/ia64-linux-gnu +++ b/config/ia64-linux-gnu @@ -68,7 +68,8 @@ case $F9X in *efc) # this is for efc v7. Older efc do not work with these. # -Vaxlib is for non-standard fortran calls like exit(). - FFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib' + MORE_FFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib' + FFLAGS="$FFLAGS $MORE_FFLAGS" HSIZE_T='SELECTED_INT_KIND(R_LARGE)' HSSIZE_T='SELECTED_INT_KIND(R_LARGE)' HID_T='SELECTED_INT_KIND(R_INTEGER)' @@ -91,7 +92,7 @@ esac if test "X$f9x_flags_set" = "X"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="" + FFLAGS="$FFLAGS" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" diff --git a/config/irix6.x b/config/irix6.x index a8a6b6f..57cf186 100644 --- a/config/irix6.x +++ b/config/irix6.x @@ -105,7 +105,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-64 -mips4 -O -s" + FFLAGS="$FFLAGS -64 -mips4 -O -s" DEBUG_FFLAGS="-64 -mips4 -O -s" PROD_FFLAGS="-64 -mips4 -O -s" PROFILE_FFLAGS="-64 -mips4 -O -s" @@ -124,7 +124,7 @@ fi if test -z "$cxx_flags_set"; then # -LANG:std required for std use; -ptused causes templates used to be # instantiated - CPPFLAGS="-LANG:std -ptused" + CPPFLAGS="$CPPFLAGS -LANG:std -ptused" # libCio is a default library, since libtool before 1.5 doesn't fully # support C++ yet, default libraries must be explicitly specified. diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index d57866f..d2436db 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -43,7 +43,7 @@ fi if test -z "$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="" + FFLAGS="$FFLAGS" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x index 482f7c3..01f3544 100644 --- a/config/powerpc-ibm-aix4.x +++ b/config/powerpc-ibm-aix4.x @@ -107,7 +107,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="-qsuffix=f=f90" - FFLAGS="-static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" + FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" FSEARCH_DIRS="-I./ -I../src" DEBUG_FFLAGS="-O" PROD_FFLAGS="-O" diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index a769ac0..07976c8 100644 --- a/config/powerpc-ibm-aix5.x +++ b/config/powerpc-ibm-aix5.x @@ -138,7 +138,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="-qsuffix=f=f90" - FFLAGS="-static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" + FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" FSEARCH_DIRS="-I./ -I../src" DEBUG_FFLAGS="-O" PROD_FFLAGS="-O" diff --git a/config/rs6000-ibm-aix4.x b/config/rs6000-ibm-aix4.x index c7a2223..6f6739c 100644 --- a/config/rs6000-ibm-aix4.x +++ b/config/rs6000-ibm-aix4.x @@ -34,7 +34,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="-qsuffix=f=f90" - FFLAGS="-static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" + FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k" FSEARCH_DIRS="-I./ -I../src" DEBUG_FFLAGS="-O" PROD_FFLAGS="-O" diff --git a/config/solaris2.x b/config/solaris2.x index 31b12ee..1d65073 100644 --- a/config/solaris2.x +++ b/config/solaris2.x @@ -17,7 +17,7 @@ fi # Try solaris native compiler flags if test "X-" = "X-$cc_flags_set"; then - CFLAGS="-erroff=%none -DBSD_COMP" + CFLAGS="$CFLAGS -erroff=%none -DBSD_COMP" DEBUG_CFLAGS="-g -xildoff" DEBUG_CPPFLAGS= PROD_CFLAGS="-O -s" @@ -60,7 +60,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="" + FFLAGS="$FFLAGS" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" @@ -88,14 +88,14 @@ cxx_vers_patch=`echo $cxx_version | cut -f3 -d.` # Specify the "-features=tmplife" if the compiler can handle this... if test -n "$cxx_version"; then if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then - CXXFLAGS="-features=tmplife" + CXXFLAGS="$CXXFLAGS -features=tmplife" fi fi # Try solaris native compiler flags if test -z "$cxx_flags_set"; then CXXFLAGS="$CXXFLAGS -instances=global" - CPPFLAGS="-LANG:std" + CPPFLAGS="$CPPFLAGS -LANG:std" DEBUG_CXXFLAGS=-g DEBUG_CPPFLAGS= PROD_CXXFLAGS="-O -s" diff --git a/config/sv1-cray b/config/sv1-cray index b026b60..a60a2be 100644 --- a/config/sv1-cray +++ b/config/sv1-cray @@ -161,7 +161,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp" + FFLAGS="$FFLAGS -dp" DEBUG_FFLAGS="-dp" PROD_FFLAGS="-dp" PROFILE_FFLAGS="-dp" diff --git a/config/unicos b/config/unicos index d30e4f5..9c0e81f 100644 --- a/config/unicos +++ b/config/unicos @@ -159,7 +159,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp" + FFLAGS="$FFLAGS -dp" DEBUG_FFLAGS="-dp" PROD_FFLAGS="-dp" PROFILE_FFLAGS="-dp" diff --git a/config/unicos10.0.X b/config/unicos10.0.X index a33c91b..c014f00 100644 --- a/config/unicos10.0.X +++ b/config/unicos10.0.X @@ -162,7 +162,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp" + FFLAGS="$FFLAGS -dp" DEBUG_FFLAGS="-dp" PROD_FFLAGS="-dp" PROFILE_FFLAGS="-dp" diff --git a/config/unicosmk b/config/unicosmk index 739abe1..6b3b75b 100644 --- a/config/unicosmk +++ b/config/unicosmk @@ -162,7 +162,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp" + FFLAGS="$FFLAGS -dp" DEBUG_FFLAGS="-dp" PROD_FFLAGS="-dp" PROFILE_FFLAGS="-dp" diff --git a/config/unicosmk2.0.5.X b/config/unicosmk2.0.5.X index ef6da59..d33a668 100644 --- a/config/unicosmk2.0.5.X +++ b/config/unicosmk2.0.5.X @@ -164,7 +164,7 @@ if test "X-" = "X-$f9x_flags_set"; then # number #. Warning 405 was stopping the executable from being built. F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp -Wl-M405" + FFLAGS="$FFLAGS -dp -Wl-M405" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" diff --git a/config/unicosmk2.0.6.X b/config/unicosmk2.0.6.X index 4514b5c..e83e7ba 100644 --- a/config/unicosmk2.0.6.X +++ b/config/unicosmk2.0.6.X @@ -164,7 +164,7 @@ if test "X-" = "X-$f9x_flags_set"; then # number #. Warning 405 and 412 were stopping the executable from being built. F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp -Wl-M405,412" + FFLAGS="$FFLAGS -dp -Wl-M405,412" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" diff --git a/config/unicosmk2.0.X b/config/unicosmk2.0.X index 406d4a4..9b357a5 100644 --- a/config/unicosmk2.0.X +++ b/config/unicosmk2.0.X @@ -164,7 +164,7 @@ if test "X-" = "X-$f9x_flags_set"; then # number #. Warning 405 was stopping the executable from being built. F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="-dp -Wl-M405" + FFLAGS="$FFLAGS -dp -Wl-M405" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" |