zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

COMP: remove linking against lib iberty, now using add2line

Browse Source
This commit is contained in:
Mark Olesen
2011-03-07 13:35:59 +01:00
parent d8b4ebde05
commit 4d418eccf7
22 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/cshrc
View File

@ -64,8 +64,8 @@ set foamCompiler=system
# WM_COMPILER = Gcc | Gcc43 | Gcc44 | Gcc45 | Clang | Icc (Intel icc)
setenv WM_COMPILER Gcc
setenv WM_COMPILER_ARCH # defined but empty
setenv WM_COMPILER_LIB_ARCH # defined but empty
#
unsetenv WM_COMPILER_LIB_ARCH
#- Architecture:
# WM_ARCH_OPTION = 32 | 64
setenv WM_ARCH_OPTION 64

7
etc/settings.csh
View File

@ -164,18 +164,19 @@ case ThirdParty:
_foamAddMan $gccDir/man
_foamAddPath $gccDir/bin
# add compiler libraries to run-time environment
# 64-bit needs lib64, but 32-bit needs lib (not lib32)
if ($WM_ARCH_OPTION == 64) then
if ($WM_ARCH_OPTION == 64 && $?WM_COMPILER_LIB_ARCH) then
_foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
else
_foamAddLib $gccDir/lib
endif
# add in gmp/mpfr libraries
# add gmp/mpfr libraries to run-time environment
_foamAddLib $gmpDir/lib
_foamAddLib $mpfrDir/lib
# add in mpc libraries (not need for older gcc)
# add mpc libraries (not need for older gcc) to run-time environment
if ( $?mpc_version ) then
_foamAddLib $mpcDir/lib
endif

6
etc/settings.sh
View File

@ -182,6 +182,7 @@ OpenFOAM | ThirdParty)
_foamAddMan $gccDir/man
_foamAddPath $gccDir/bin
# add compiler libraries to run-time environment
# 64-bit needs lib64, but 32-bit needs lib (not lib32)
if [ "$WM_ARCH_OPTION" = 64 ]
then
@ -190,11 +191,12 @@ OpenFOAM | ThirdParty)
_foamAddLib $gccDir/lib
fi
# add in gmp/mpfr libraries
# add gmp/mpfr libraries to run-time environment
_foamAddLib $gmpDir/lib
_foamAddLib $mpfrDir/lib
# add in mpc libraries (not need for older gcc)
# add mpc libraries (not need for older gcc) to run-time environment
if [ -n "$mpc_version" ]
then
_foamAddLib $mpcDir/lib

2
wmake/rules/SiCortex64Gcc/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -A64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/SunOS64Gcc/general
View File

@ -1,7 +1,7 @@
CPP = /lib/cpp
LD = ld -64
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Clang/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Gcc++0x/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Gcc/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Gcc43/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Gcc44/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Gcc45/general
View File

@ -1,6 +1,6 @@
CPP = cpp -traditional-cpp
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linux64Icc/general
View File

@ -1,6 +1,6 @@
CPP = /lib/cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxClang/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc43/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc44/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxGcc45/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

3
wmake/rules/linuxIA64Gcc/general
View File

@ -1,5 +1,6 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxIA64Icc/general
View File

@ -1,6 +1,6 @@
CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH
GLIBS = -liberty
GLIBS =
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxIcc/general
View File

@ -1,7 +1,7 @@
CPP = /lib/cpp -traditional-cpp $(GFLAGS)
LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/linuxPPC64Gcc/general
View File

@ -1,7 +1,7 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld -m elf64ppc
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard

2
wmake/rules/solarisGcc/general
View File

@ -1,6 +1,6 @@
CPP = /usr/lib/cpp -undef
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
PROJECT_LIBS = -l$(WM_PROJECT) -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
include $(GENERAL_RULES)/standard