X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fgcc-common.sh;h=c6124b3a0689e0435c66877ef3b0ccb84e56490b;hb=1a2c6232fd3655d817647ef866dd338186d2aa77;hp=960294e0e8d6eef931977c6525614d8f8de34b50;hpb=7bacfa2f11b13a9c0e38c3b0e17bf6bb311bc9ae;p=tools%2Finstall.git

diff --git a/config_files/gcc-common.sh b/config_files/gcc-common.sh
index 960294e..c6124b3 100755
--- a/config_files/gcc-common.sh
+++ b/config_files/gcc-common.sh
@@ -6,7 +6,7 @@
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
 #  Module    : Installation Wizard
-#  Copyright : 2002-2007 CEA
+#  Copyright : 2002-2008 CEA
 #
 #  This script is the part of the SALOME installation procedure.
 #
@@ -51,14 +51,14 @@ if [ -n "${gcc_root}" ] ; then
 	ld_library_path=`sort_path ${tmp}`
 	cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export GCC_ROOT=${gcc_root}
-export CXX=\${GCC_ROOT}/bin/g++
-export CC=\${GCC_ROOT}/bin/gcc
-export PATH=${path}
-export LD_LIBRARY_PATH=${ld_library_path}
+#export GCC_ROOT=${gcc_root}
+#export CXX=\${GCC_ROOT}/bin/g++
+#export CC=\${GCC_ROOT}/bin/gcc
+#export PATH=${path}
+#export LD_LIBRARY_PATH=${ld_library_path}
 ##
 EOF
-	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
+	make_env ${INST_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}"
 #######       THIS COULD BE USED FOR STRICT COMPARISON  ##############################
 #	if [ $maj_ver -eq 3 ] && [ $min_ver -eq 2 ] && [ $rel_ver -eq 0 ] ;  then 
 ######################################################################################
@@ -73,19 +73,19 @@ return 1
 }
 
 try_preinstalled(){
-echo "It is impossible to install gcc from binaries or sources! So native gcc will be used."
+#echo "It is impossible to install gcc from binaries or sources! So native gcc will be used."
 try_native
 }
 
 export PROCEDURE=$1;
 export INSTALL_WORK=$2;
 export SOURCE_DIR=$3;
-export INSTALL_ROOT=$4;
+export INST_ROOT=$4;
 export PRODUCT_SEQUENCE=$5;
 export PRODUCT_TYPE=$6;
 export INSTALL_PRODUCTS=$7;
 export PRODUCT="gcc-$GCC_VERSION"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INST_ROOT}/${PRODUCT}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 source ./common.sh
 $PROCEDURE