zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: missing library arch on 3rd party gmp/mpfr/mpc paths issue #148

Browse Source 
STYLE: drop conditional check on mpc.

- was for older gcc, but is a requisite for gcc >= 4.5
This commit is contained in:
Mark Olesen
2016-06-16 15:54:06 +02:00
parent d5d0174b01
commit 62f634c014
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
etc/config.csh/settings
View File

@ -275,9 +275,7 @@ case ThirdParty:
set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
set mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version set mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
if ( $?mpc_version ) then set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
endif
# Check that the compiler directory can be found # Check that the compiler directory can be found
if ( ! -d "$gccDir" ) then if ( ! -d "$gccDir" ) then
@ -296,14 +294,10 @@ case ThirdParty:
# Add compiler libraries to run-time environment # Add compiler libraries to run-time environment
_foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
# Add gmp/mpfr libraries to run-time environment # Add gmp/mpfr/mpc libraries to run-time environment
_foamAddLib $gmpDir/lib _foamAddLib $gmpDir/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $mpfrDir/lib _foamAddLib $mpfrDir/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $mpcDir/lib$WM_COMPILER_LIB_ARCH
# Add mpc libraries (not need for older gcc) to run-time environment
if ( $?mpc_version ) then
_foamAddLib $mpcDir/lib
endif
# Used by boost/CGAL: # Used by boost/CGAL:
setenv MPFR_ARCH_PATH $mpfrDir setenv MPFR_ARCH_PATH $mpfrDir

13
etc/config.sh/settings
View File

@ -240,15 +240,10 @@ OpenFOAM | ThirdParty)
# Add compiler libraries to run-time environment # Add compiler libraries to run-time environment
_foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
# Add gmp/mpfr libraries to run-time environment # Add gmp/mpfr/mpc libraries to run-time environment
_foamAddLib $gmpDir/lib _foamAddLib $gmpDir/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $mpfrDir/lib _foamAddLib $mpfrDir/lib$WM_COMPILER_LIB_ARCH
_foamAddLib $mpcDir/lib$WM_COMPILER_LIB_ARCH
# Add mpc libraries (not need for older gcc) to run-time environment
if [ -n "$mpc_version" ]
then
_foamAddLib $mpcDir/lib
fi
# Used by boost/CGAL: # Used by boost/CGAL:
export MPFR_ARCH_PATH=$mpfrDir export MPFR_ARCH_PATH=$mpfrDir