songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Two minor changes suggested by Wieger. 

* One COMPILER='' line added(to prevent from wrong auto-choosing).
* replaced '_rtti' extension by '-rtti' as suggested by Sven.
This commit is contained in:
Michael Hoffmann 1997-06-30 09:20:33 +00:00
parent f4b487a513
commit 5a1bc6dc08
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Packages/Installation/install_cgal
View File

@ -38,8 +38,9 @@ STL_DIR=''
# type of STL: (see test_stl_version below) # type of STL: (see test_stl_version below)
CGAL_STL_VERSION='CGAL_STL_UNKNOWN' CGAL_STL_VERSION='CGAL_STL_UNKNOWN'
# toggles use of gcc rtti patch ('' - no, '_rtti' - use it) # toggles use of gcc rtti patch ('' - no, '-rtti' - use it)
GCC_RTTI_PATCH_EXT='' GCC_RTTI_PATCH_EXT=''
GCC_RTTI_PATCH_DIR=''
# logfile for testsuite: # logfile for testsuite:
TEST_LOGFILE=${CGAL_TEST_DIR}/error.txt TEST_LOGFILE=${CGAL_TEST_DIR}/error.txt
@ -439,6 +440,7 @@ _search_compiler()
COMPILER="$2" COMPILER="$2"
compute_compiler_version `compiler_bin ${COMPILER}` compute_compiler_version `compiler_bin ${COMPILER}`
eval "_COMPILER_$_COMPILER_NUMBER=\"${COMPILER}\"" eval "_COMPILER_$_COMPILER_NUMBER=\"${COMPILER}\""
COMPILER=''
eval "$_EXPR $_COMPILER_NUMBER + 1" eval "$_EXPR $_COMPILER_NUMBER + 1"
_COMPILER_NUMBER=$_result _COMPILER_NUMBER=$_result
fi fi
@ -876,7 +878,7 @@ check_GCC_RTTI_PATCH_DIR()
check_GCC_RTTI_PATCH_EXT() check_GCC_RTTI_PATCH_EXT()
{ {
if [ "${GCC_RTTI_PATCH_EXT}" != "" -a \ if [ "${GCC_RTTI_PATCH_EXT}" != "" -a \
"${GCC_RTTI_PATCH_EXT}" != "_rtti" ]; then "${GCC_RTTI_PATCH_EXT}" != "-rtti" ]; then
$1 "WARNING: GCC_RTTI_PATCH_EXT" $1 "WARNING: GCC_RTTI_PATCH_EXT"
$1 " is not set correctly." $1 " is not set correctly."
return 0 return 0
@ -1694,7 +1696,7 @@ dir_menu()
r|R) r|R)
_CHANGED='y' _CHANGED='y'
if [ -z "${GCC_RTTI_PATCH_EXT}" ]; then if [ -z "${GCC_RTTI_PATCH_EXT}" ]; then
GCC_RTTI_PATCH_EXT='_rtti' GCC_RTTI_PATCH_EXT='-rtti'
else else
GCC_RTTI_PATCH_EXT='' GCC_RTTI_PATCH_EXT=''
fi fi
@ -2392,12 +2394,12 @@ case $* in
make_lib_dir make_lib_dir
# create the makefiles # create the makefiles
CGAL_MAKEFILE=${CGAL_MAKE_DIR}/makefile_${_libname} CGAL_MAKEFILE=${CGAL_MAKE_DIR}/makefile_`full_ostype`
generatemakefiles echo generatemakefiles echo
LEDA_EXT='_LEDA' LEDA_EXT='_LEDA'
make_lib_dir make_lib_dir
GCC_RTTI_PATCH_EXT='_rtti' GCC_RTTI_PATCH_EXT='-rtti'
make_lib_dir make_lib_dir
LEDA_EXT='' LEDA_EXT=''
make_lib_dir make_lib_dir