diff options
| author | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-10-24 14:32:52 +0000 |
|---|---|---|
| committer | tradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2001-10-24 14:32:52 +0000 |
| commit | fb4b02a25c8b94f20a8e8e846a5c4f735985958c (patch) | |
| tree | e872c3af78e125109750bfb71728b91d48f5a658 /lib/make | |
| parent | f84959fc6e8e4d73f39ff818d37df24e22acfc0d (diff) | |
More changes for the Intel compilers: if they aren't used for linking
the option '-Qy ...' will be added to LDFLAGS.
Also use option '-O0' to completely switch off optimization if it was
configured without optimization. This allows people with low memory machines
to compile heavy fortran code (like ADM_BSSN).
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2432 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
| -rw-r--r-- | lib/make/known-architectures/linux | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux index 21bceb74..7384c401 100644 --- a/lib/make/known-architectures/linux +++ b/lib/make/known-architectures/linux @@ -184,8 +184,13 @@ else : ${LIBS="fortran ffio m"} ;; Intel) - : ${F77FLAGS='-132 -w95'} - : ${F90FLAGS='-132 -w95'} + if test "$OPTIMISE" = "no"; then + : ${F77FLAGS='-132 -w95 -O0'} + : ${F90FLAGS='-132 -w95 -O0'} + else + : ${F77FLAGS='-132 -w95'} + : ${F90FLAGS='-132 -w95'} + fi : ${F77_OPTIMISE_FLAGS='-O3'} : ${F90_OPTIMISE_FLAGS='-O3'} : ${LIBS="intrins IEPCF90 F90 m"} @@ -193,9 +198,11 @@ else # add the libpath if the linker is not Intel if test "$LD" != "icc" -a -n "$IA32ROOT" ; then : ${LIBDIRS='$(IA32ROOT)/lib'} + : ${LDFLAGS='-Qy $(IA32ROOT)/lib/icrt.link'} fi if test "$LD" != "ecc" -a -n "$IA64ROOT" ; then : ${LIBDIRS='$(IA64ROOT)/lib'} + : ${LDFLAGS='-Qy $(IA64ROOT)/lib/icrt.link'} fi ;; Compaq) @@ -219,6 +226,9 @@ else # Note that the defaults settings are for gcc/g++ and they are set by configure case "$CC" in [ei]cc) + if test "$OPTIMISE" = "no"; then + : ${CFLAGS='-O0'} + fi : ${C_OPTIMISE_FLAGS='-O3'} : ${C_DEPEND='$(CC) -M $(CPPFLAGS)'} : ${C_WARN_FLAGS='-w2'} @@ -236,6 +246,9 @@ else case "$CXX" in [ei]cc | ecpc) + if test "$OPTIMISE" = "no"; then + : ${CFLAGS='-O0'} + fi : ${CXX_OPTIMISE_FLAGS='-O3'} : ${CXX_DEPEND='$(CXX) -M $(CPPFLAGS)'} ;; |