summaryrefslogtreecommitdiff
path: root/lib/make
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2002-04-10 12:06:11 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2002-04-10 12:06:11 +0000
commit01011e72dc52d59308565f0e45b1a9c9b6574c47 (patch)
tree423d0c6e1db03772f573f007f59bd777c5ea6e1a /lib/make
parenta52ad400d69aab7bb86dac72abe2d95d47effaec (diff)
Explicitly switch off optimization with '-O0' if OPTIMISE=no.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2704 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
-rw-r--r--lib/make/known-architectures/osf31
1 files changed, 20 insertions, 11 deletions
diff --git a/lib/make/known-architectures/osf b/lib/make/known-architectures/osf
index d4021101..bc913341 100644
--- a/lib/make/known-architectures/osf
+++ b/lib/make/known-architectures/osf
@@ -6,7 +6,7 @@
# @desc
# known-architectures file for OSF systems
# @enddesc
-# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/osf,v 1.9 2002-04-08 13:37:00 tradke Exp $
+# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/make/known-architectures/osf,v 1.10 2002-04-10 12:06:11 tradke Exp $
# @@*/
if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then
@@ -18,34 +18,43 @@ if test "$CCTK_CONFIG_STAGE" = "preferred-compilers" ; then
else
+ STD_FLAGS='std1'
+
+ # need to explicitly add '-O0' to switch off default optimization level
+ if test "X$OPTIMISE" = "Xno"; then
+ STD_FLAGS="$STD_FLAGS -O0"
+ fi
+
+ # PTHREADS need the '-pthread' flag set
+ if test "X$PTHREADS" = "Xyes" ; then
+ STD_FLAGS="$STD_FLAGS -pthread"
+ fi
+
if test "$CC" = "cc" ; then
if test "X$PTHREADS" = "Xyes" ; then
- : ${CFLAGS='-std1 -pthread'}
: ${C_DEPEND='$(CC) -pthread -E -M $(CPPFLAGS)'}
- else
- : ${CFLAGS='-std1'}
fi
+ : ${CFLAGS="$STD_FLAGS"}
: ${C_OPTIMISE_FLAGS='-O5 -fast'}
: ${C_DEBUG_FLAGS='-g3'}
fi
if test "$CXX" = "cxx" ; then
- : ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS) -noimplicit_include'}
if test "X$PTHREADS" = "Xyes" ; then
- : ${CXXFLAGS='-std1 -pthread'}
- : ${CXX_DEPEND='$(CXX) -pthread -E -M $(CPPFLAGS)'}
+ : ${CXX_DEPEND='$(CXX) -pthread -noimplicit_include -E -M $(CPPFLAGS)'}
else
- : ${CXXFLAGS='-std1'}
+ : ${CXX_DEPEND='$(CXX) -noimplicit_include -E -M $(CPPFLAGS)'}
fi
+ : ${CXXFLAGS="$STD_FLAGS"}
: ${CXX_OPTIMISE_FLAGS='-O5 -fast'}
: ${CXX_DEBUG_FLAGS='-g3'}
fi
- : ${F77FLAGS='-std1'}
+ : ${F77FLAGS="$STD_FLAGS"}
+ : ${F90FLAGS="$STD_FLAGS"}
: ${F77_OPTIMISE_FLAGS='-O5 -fast'}
- : ${F77_DEBUG_FLAGS='-g3'}
- : ${F90FLAGS='-std1'}
: ${F90_OPTIMISE_FLAGS='-O5 -fast'}
+ : ${F77_DEBUG_FLAGS='-g3'}
: ${F90_DEBUG_FLAGS='-g3'}
: ${LIBS="for m"}