diff options
author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-11-14 20:10:07 (GMT) |
---|---|---|
committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-11-14 20:10:07 (GMT) |
commit | 217d9341339c9127a4b04e05a70b92ca3c512439 (patch) | |
tree | 011a43df28245a221e994c115dbb482c4504bbe4 /fortran | |
parent | 9b27239ba8826056e0a74387c5b026e4b76c2066 (diff) | |
download | hdf5-217d9341339c9127a4b04e05a70b92ca3c512439.zip hdf5-217d9341339c9127a4b04e05a70b92ca3c512439.tar.gz hdf5-217d9341339c9127a4b04e05a70b92ca3c512439.tar.bz2 |
[svn-r7851] Purpose:
Buglet Fix
Description:
The FFLAGS environment variable wasn't being passed to the Makefiles.
The config files weren't including it when they set the FFLAGS
variable.
Solution:
Changed the FFLAGS="..." command to FFLAGS="$FFLAGS ..." instead.
Platforms tested:
Copper
Arabica
Verbena
Misc. update:
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/config/dec-flags | 2 | ||||
-rw-r--r-- | fortran/config/hpux10.20 | 2 | ||||
-rw-r--r-- | fortran/config/hpux11.00 | 2 | ||||
-rw-r--r-- | fortran/config/ia64-linux-gnu | 5 | ||||
-rw-r--r-- | fortran/config/irix6.x | 4 | ||||
-rw-r--r-- | fortran/config/linux-gnulibc1 | 2 | ||||
-rw-r--r-- | fortran/config/powerpc-ibm-aix4.x | 2 | ||||
-rw-r--r-- | fortran/config/powerpc-ibm-aix5.x | 2 | ||||
-rw-r--r-- | fortran/config/rs6000-ibm-aix4.x | 2 | ||||
-rw-r--r-- | fortran/config/solaris2.x | 2 | ||||
-rw-r--r-- | fortran/config/sv1-cray | 2 | ||||
-rw-r--r-- | fortran/config/unicos | 2 | ||||
-rw-r--r-- | fortran/config/unicos10.0.X | 2 | ||||
-rw-r--r-- | fortran/config/unicosmk | 2 | ||||
-rw-r--r-- | fortran/config/unicosmk2.0.5.X | 2 | ||||
-rw-r--r-- | fortran/config/unicosmk2.0.6.X | 2 | ||||
-rw-r--r-- | fortran/config/unicosmk2.0.X | 2 |
17 files changed, 20 insertions, 19 deletions
diff --git a/fortran/config/dec-flags b/fortran/config/dec-flags index 9af2aae..c5ecc43 100644 --- a/fortran/config/dec-flags +++ b/fortran/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/fortran/config/hpux10.20 b/fortran/config/hpux10.20 index 97022c4..823e2b1 100644 --- a/fortran/config/hpux10.20 +++ b/fortran/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/fortran/config/hpux11.00 b/fortran/config/hpux11.00 index 97022c4..823e2b1 100644 --- a/fortran/config/hpux11.00 +++ b/fortran/config/hpux11.00 @@ -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/fortran/config/ia64-linux-gnu b/fortran/config/ia64-linux-gnu index b868dc4..8c21110 100644 --- a/fortran/config/ia64-linux-gnu +++ b/fortran/config/ia64-linux-gnu @@ -64,7 +64,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)' @@ -86,7 +87,7 @@ esac if test -z "$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="" + FFLAGS="$FFLAGS" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" diff --git a/fortran/config/irix6.x b/fortran/config/irix6.x index 10c48cf..8e7dd3e 100644 --- a/fortran/config/irix6.x +++ b/fortran/config/irix6.x @@ -88,7 +88,7 @@ if test "X-" = "X-$F9X"; then F9X="f90" 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" @@ -119,7 +119,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" diff --git a/fortran/config/linux-gnulibc1 b/fortran/config/linux-gnulibc1 index 7ecead5..a4dfc79 100644 --- a/fortran/config/linux-gnulibc1 +++ b/fortran/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/fortran/config/powerpc-ibm-aix4.x b/fortran/config/powerpc-ibm-aix4.x index 5124107..01b252d 100644 --- a/fortran/config/powerpc-ibm-aix4.x +++ b/fortran/config/powerpc-ibm-aix4.x @@ -35,7 +35,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/fortran/config/powerpc-ibm-aix5.x b/fortran/config/powerpc-ibm-aix5.x index 9b9a4d1..6efb1e8 100644 --- a/fortran/config/powerpc-ibm-aix5.x +++ b/fortran/config/powerpc-ibm-aix5.x @@ -87,7 +87,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/fortran/config/rs6000-ibm-aix4.x b/fortran/config/rs6000-ibm-aix4.x index 5124107..01b252d 100644 --- a/fortran/config/rs6000-ibm-aix4.x +++ b/fortran/config/rs6000-ibm-aix4.x @@ -35,7 +35,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/fortran/config/solaris2.x b/fortran/config/solaris2.x index 52df28e..9c30c71 100644 --- a/fortran/config/solaris2.x +++ b/fortran/config/solaris2.x @@ -56,7 +56,7 @@ fi if test "X-" = "X-$f9x_flags_set"; then F9XSUFFIXFLAG="" FSEARCH_DIRS="" - FFLAGS="" + FFLAGS="$FFLAGS" DEBUG_FFLAGS="" PROD_FFLAGS="" PROFILE_FFLAGS="" diff --git a/fortran/config/sv1-cray b/fortran/config/sv1-cray index e2a4baf..02ae604 100644 --- a/fortran/config/sv1-cray +++ b/fortran/config/sv1-cray @@ -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/fortran/config/unicos b/fortran/config/unicos index 541bd78..1858c9a 100644 --- a/fortran/config/unicos +++ b/fortran/config/unicos @@ -160,7 +160,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/fortran/config/unicos10.0.X b/fortran/config/unicos10.0.X index 541bd78..1858c9a 100644 --- a/fortran/config/unicos10.0.X +++ b/fortran/config/unicos10.0.X @@ -160,7 +160,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/fortran/config/unicosmk b/fortran/config/unicosmk index e2a4baf..02ae604 100644 --- a/fortran/config/unicosmk +++ b/fortran/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/fortran/config/unicosmk2.0.5.X b/fortran/config/unicosmk2.0.5.X index 68a19a8..61d82d3 100644 --- a/fortran/config/unicosmk2.0.5.X +++ b/fortran/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/fortran/config/unicosmk2.0.6.X b/fortran/config/unicosmk2.0.6.X index e4e02fc..b228242 100644 --- a/fortran/config/unicosmk2.0.6.X +++ b/fortran/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/fortran/config/unicosmk2.0.X b/fortran/config/unicosmk2.0.X index 68a19a8..61d82d3 100644 --- a/fortran/config/unicosmk2.0.X +++ b/fortran/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="" |