From: maintenance team <salome-mnt@opencascade.com>
Date: Wed, 18 Apr 2007 09:04:57 +0000 (+0000)
Subject: Update for 64bit case. Several keys in CFLAGS and CXXFLAGS
X-Git-Tag: V_3_2_9~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5ac3ac3f507ec137c7809c7c5b22da16d6baa661;p=tools%2Finstall.git

Update for 64bit case. Several keys in CFLAGS and CXXFLAGS
---

diff --git a/config_files/CAS-6.2.sh b/config_files/CAS-6.2.sh
index 2f70bee..2e00cc1 100755
--- a/config_files/CAS-6.2.sh
+++ b/config_files/CAS-6.2.sh
@@ -99,8 +99,6 @@ cd ${PRODUCT_WORK}
 
 # configure
 if test `uname -m` = "x86_64" ; then
-    flags="$flags CFLAGS=-m64 -D_OCC64"
-    flags="$flags CXXFLAGS=-m64 -D_OCC64"
     flags="$flags --with-xmu-include=/usr/X11R6/include/X11"
     flags="$flags --with-xmu-library=/usr/X11R6/lib64"
 else
@@ -121,7 +119,21 @@ if [ $? -eq 0 ] ; then flags="$flags --with-dps-include=$dpsdir/include --with-d
 flags="$flags --disable-debug --enable-production"
 
 export CASROOT=${PRODUCT_WORK}
-check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure $flags --prefix=${PRODUCT_DIR}
+
+if test `uname -m` = "x86_64" ; then
+echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+./configure --prefix=${PRODUCT_DIR} $flags CFLAGS="-m64 -D_OCC64" CXXFLAGS="-m64 -D_OCC64" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
+else
+echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} $flags  >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+./configure --prefix=${PRODUCT_DIR} $flags >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${INSTALL_WORK}/errlog
+fi
+
+if [ "$?" -ne "0" ] ; then
+    cat ${PRODUCT_DIR}/CONFIGURE.LOG
+    cat ${INSTALL_WORK}/errlog >&2
+    cat ${INSTALL_WORK}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG
+    exit 1
+fi
 
 # make
 GCC=`which gcc`