diff options
| author | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-02-17 18:35:05 +0000 |
|---|---|---|
| committer | allen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-02-17 18:35:05 +0000 |
| commit | a025121fc53cfc3e658744c5625cf541aacb8a91 (patch) | |
| tree | 11017337ffde2ba66474ad461fa56431183c26bd /lib/make | |
| parent | 599217cee7beb31b27a63178a6559797fe824652 (diff) | |
Fix for Compilation/370
Use options from the configuration line/configuration file if they are available
These then overwrite the autoconf options, so if you want to add just
one optimisation flag, you also need to provide the ones which were already there. Sometime we may extend the notation to enable you to add flags etc.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2025 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/known-architectures/irix | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/lib/make/known-architectures/irix b/lib/make/known-architectures/irix index ab7f675d..30b0eee5 100644 --- a/lib/make/known-architectures/irix +++ b/lib/make/known-architectures/irix @@ -6,7 +6,7 @@ # @desc # # @enddesc -# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.23 2000-09-26 13:09:00 allen Exp $ +# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/irix,v 1.24 2001-02-17 18:35:05 allen Exp $ # @@*/ if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then @@ -75,10 +75,10 @@ else case $IRIX_BITS in 64) - LIBS="$LIBS malloc perfex fpe $IRIX_FLIBS m" + : ${LIBS="$LIBS malloc perfex fpe $IRIX_FLIBS m"} ;; 32) - LIBS="$LIBS malloc fpe $IRIX_FLIBS m" + : ${LIBS="$LIBS malloc fpe $IRIX_FLIBS m"} ;; *) ;; @@ -105,20 +105,20 @@ else case "$IRIX_BITS:$CC" in 64:cc) - CFLAGS="$CFLAGS -64 $IRIX_FLAGS" - CXXFLAGS="$CXXFLAGS -64 $IRIX_FLAGS" - C_OPTIMISE_FLAGS="-O3" - CXX_OPTIMISE_FLAGS="-O3" - C_DEBUG_FLAGS="-g" - CXX_DEBUG_FLAGS="-g" + : ${CFLAGS="$CFLAGS -64 $IRIX_FLAGS"} + : ${CXXFLAGS="$CXXFLAGS -64 $IRIX_FLAGS"} + : ${C_OPTIMISE_FLAGS="-O3"} + : ${CXX_OPTIMISE_FLAGS="-O3"} + : ${C_DEBUG_FLAGS="-g"} + : ${CXX_DEBUG_FLAGS="-g"} ;; 32:cc) - CFLAGS="$CFLAGS -n32 $IRIX_FLAGS" - CXXFLAGS="$CXXFLAGS -n32 $IRIX_FLAGS" - C_OPTIMISE_FLAGS="-O3" - CXX_OPTIMISE_FLAGS="-O3" - C_DEBUG_FLAGS="-g" - CXX_DEBUG_FLAGS="-g" + : ${CFLAGS="$CFLAGS -n32 $IRIX_FLAGS"} + : ${CXXFLAGS="$CXXFLAGS -n32 $IRIX_FLAGS"} + : ${C_OPTIMISE_FLAGS="-O3"} + : ${CXX_OPTIMISE_FLAGS="-O3"} + : ${C_DEBUG_FLAGS="-g"} + : ${CXX_DEBUG_FLAGS="-g"} ;; *) ;; @@ -126,25 +126,25 @@ else case "$IRIX_BITS" in 64) - F90FLAGS="$F90FLAGS \ + : ${F90FLAGS="$F90FLAGS \ -r10000 -TARG:proc=r10000 \ - -64 -mips4" - F77FLAGS="$F90FLAGS" - F90_OPTIMISE_FLAGS="-O3 \ - -OPT:roundoff=3:IEEE_arithmetic=3:const_copy_limit=100000" - F77_OPTIMISE_FLAGS="$F90_OPTIMISE_FLAGS" - F90_DEBUG_FLAGS="-g" - F77_DEBUG_FLAGS="-g" + -64 -mips4"} + : ${F77FLAGS="$F90FLAGS"} + : ${F90_OPTIMISE_FLAGS="-O3 \ + -OPT:roundoff=3:IEEE_arithmetic=3:const_copy_limit=100000"} + : ${F77_OPTIMISE_FLAGS="$F90_OPTIMISE_FLAGS"} + : ${F90_DEBUG_FLAGS="-g"} + : ${F77_DEBUG_FLAGS="-g"} ;; 32) - F90FLAGS="\ + : ${F90FLAGS="\ -OPT:roundoff=3:IEEE_arithmetic=3:fold_arith_limit=10000:const_copy_limit=100000 \ - -n32 -mips3" - F77FLAGS="$F90FLAGS" - F90_OPTIMISE_FLAGS="-O3" - F77_OPTIMISE_FLAGS="-O3" - F90_DEBUG_FLAGS="-g" - F77_DEBUG_FLAGS="-g" + -n32 -mips3"} + : ${F77FLAGS="$F90FLAGS"} + : ${F90_OPTIMISE_FLAGS="-O3"} + : ${F77_OPTIMISE_FLAGS="-O3"} + : ${F90_DEBUG_FLAGS="-g"} + : ${F77_DEBUG_FLAGS="-g"} ;; *) ;; @@ -152,10 +152,10 @@ esac case "$IRIX_BITS:$LD" in 64:CC) - LDFLAGS="$LDFLAGS -64 -Wl,\"-woff 84\",\"-woff 85\"" + : ${LDFLAGS="$LDFLAGS -64 -Wl,\"-woff 84\",\"-woff 85\""} ;; 32:CC) - LDFLAGS="$LDFLAGS -n32 -Wl,\"-woff 84\",\"-woff 85\"" + : ${LDFLAGS="$LDFLAGS -n32 -Wl,\"-woff 84\",\"-woff 85\""} ;; *) ;; |