From 58791996e167b94c1ec0ff644bf97a49fd137318 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee>
Date: Wed, 30 Jun 2010 22:46:56 +0000
Subject: Detect IBM XL compilers, which need to be set to 64-bit mode

git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@20 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
---
 LORENE.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/LORENE.sh b/LORENE.sh
index 3145d12..efb9505 100644
--- a/LORENE.sh
+++ b/LORENE.sh
@@ -41,8 +41,11 @@ if [ -z "${LORENE_DIR}" ]; then
     INSTALL_DIR=${SCRATCH_BUILD}
     LORENE_DIR=${INSTALL_DIR}/build-${NAME}/${NAME}
     
-    # Clean up environment
+    # Set up environment
     unset LIBS
+    if echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1; then
+        export OBJECT_MODE=64
+    fi
     
 (
     exec >&2                    # Redirect stdout to stderr
@@ -101,15 +104,17 @@ if [ -z "${LORENE_DIR}" ]; then
         
         echo "LORENE: Configuring..."
         pushd build-${NAME}/${NAME}
+        if echo ${F77} | grep -i xlf > /dev/null 2>&1; then
+            FIXEDF77FLAGS=-qfixed
+        fi
         cat > local_settings <<EOF
 CXX = ${CXX}
 CXXFLAGS = ${CXXFLAGS}
 CXXFLAGS_G = ${CXXFLAGS}
 F77 = ${F77}
-F77FLAGS = ${F77FLAGS} $($(echo ${F77} | grep -i xlf > /dev/null 2>&1) && echo '' -qfixed)
-F77FLAGS_G = ${F77FLAGS} $($(echo ${F77} | grep -i xlf > /dev/null 2>&1) && echo '' -qfixed)
-INC = -I\$(HOME_LORENE)/C++/Include -I\$(HOME_LORENE)/C++/Include_extra $(echo ${GSL_INC_DIRS} | xargs -n 1 -I @ echo -I@)
-$($(echo '' ${ARFLAGS} | grep 64 > /dev/null 2>&1) && echo "export OBJECT_MODE=64")
+F77FLAGS = ${F77FLAGS} ${FIXEDF77FLAGS}
+F77FLAGS_G = ${F77FLAGS} ${FIXEDF77FLAGS}
+INC = -I\$(HOME_LORENE)/C++/Include -I\$(HOME_LORENE)/C++/Include_extra \$(addprefix -I,${GSL_INC_DIRS})
 RANLIB = ${RANLIB}
 # We don't need dependencies since we always build from scratch
 #MAKEDEPEND = ${CXX_DEPEND} \$(INC) \$< ${CXX_DEPEND_OUT} && mv \$@ \$(df).d
-- 
cgit v1.2.3