From 4d418eccf7a01177fc2f40baf8be7704854386da Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 7 Mar 2011 13:35:59 +0100 Subject: [PATCH] COMP: remove linking against lib iberty, now using add2line --- etc/cshrc | 4 ++-- etc/settings.csh | 7 ++++--- etc/settings.sh | 6 ++++-- wmake/rules/SiCortex64Gcc/general | 2 +- wmake/rules/SunOS64Gcc/general | 2 +- wmake/rules/linux64Clang/general | 2 +- wmake/rules/linux64Gcc++0x/general | 2 +- wmake/rules/linux64Gcc/general | 2 +- wmake/rules/linux64Gcc43/general | 2 +- wmake/rules/linux64Gcc44/general | 2 +- wmake/rules/linux64Gcc45/general | 2 +- wmake/rules/linux64Icc/general | 2 +- wmake/rules/linuxClang/general | 2 +- wmake/rules/linuxGcc/general | 2 +- wmake/rules/linuxGcc43/general | 2 +- wmake/rules/linuxGcc44/general | 2 +- wmake/rules/linuxGcc45/general | 2 +- wmake/rules/linuxIA64Gcc/general | 3 ++- wmake/rules/linuxIA64Icc/general | 2 +- wmake/rules/linuxIcc/general | 2 +- wmake/rules/linuxPPC64Gcc/general | 2 +- wmake/rules/solarisGcc/general | 2 +- 22 files changed, 30 insertions(+), 26 deletions(-) diff --git a/etc/cshrc b/etc/cshrc index 9b9f04c47c..476efeb433 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -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 diff --git a/etc/settings.csh b/etc/settings.csh index 48b234a337..76beaadb51 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -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 diff --git a/etc/settings.sh b/etc/settings.sh index beebfacf74..edbabe3cb6 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -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 diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general index aeab411b5b..c0c59a7220 100644 --- a/wmake/rules/SiCortex64Gcc/general +++ b/wmake/rules/SiCortex64Gcc/general @@ -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 diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general index d24e8f0056..83b7ebf4e0 100644 --- a/wmake/rules/SunOS64Gcc/general +++ b/wmake/rules/SunOS64Gcc/general @@ -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 diff --git a/wmake/rules/linux64Clang/general b/wmake/rules/linux64Clang/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Clang/general +++ b/wmake/rules/linux64Clang/general @@ -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 diff --git a/wmake/rules/linux64Gcc++0x/general b/wmake/rules/linux64Gcc++0x/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc++0x/general +++ b/wmake/rules/linux64Gcc++0x/general @@ -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 diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -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 diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc43/general +++ b/wmake/rules/linux64Gcc43/general @@ -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 diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general index 809751cd0a..243cb7d8c7 100644 --- a/wmake/rules/linux64Gcc44/general +++ b/wmake/rules/linux64Gcc44/general @@ -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 diff --git a/wmake/rules/linux64Gcc45/general b/wmake/rules/linux64Gcc45/general index fcd79624e9..4a42b11b1e 100644 --- a/wmake/rules/linux64Gcc45/general +++ b/wmake/rules/linux64Gcc45/general @@ -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 diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general index 4f411aec98..45c285f1ee 100644 --- a/wmake/rules/linux64Icc/general +++ b/wmake/rules/linux64Icc/general @@ -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 diff --git a/wmake/rules/linuxClang/general b/wmake/rules/linuxClang/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxClang/general +++ b/wmake/rules/linuxClang/general @@ -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 diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -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 diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxGcc43/general +++ b/wmake/rules/linuxGcc43/general @@ -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 diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general index 97ce8c940c..fa1eb5b925 100644 --- a/wmake/rules/linuxGcc44/general +++ b/wmake/rules/linuxGcc44/general @@ -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 diff --git a/wmake/rules/linuxGcc45/general b/wmake/rules/linuxGcc45/general index fdd03dc9a5..4b051e6b98 100644 --- a/wmake/rules/linuxGcc45/general +++ b/wmake/rules/linuxGcc45/general @@ -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 diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general index 44c2e33667..480ea1b9c4 100644 --- a/wmake/rules/linuxIA64Gcc/general +++ b/wmake/rules/linuxIA64Gcc/general @@ -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 diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general index 748cfe770d..9dc446d4b2 100644 --- a/wmake/rules/linuxIA64Icc/general +++ b/wmake/rules/linuxIA64Icc/general @@ -1,6 +1,6 @@ CPP = /lib/cpp -traditional-cpp $(GFLAGS) -DICC_IA64_PREFETCH -GLIBS = -liberty +GLIBS = include $(GENERAL_RULES)/standard diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general index e4d0cb7d7b..8a38ddf6d4 100644 --- a/wmake/rules/linuxIcc/general +++ b/wmake/rules/linuxIcc/general @@ -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 diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general index ad4126abe8..fa717f9645 100644 --- a/wmake/rules/linuxPPC64Gcc/general +++ b/wmake/rules/linuxPPC64Gcc/general @@ -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 diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general index c8641ef7e5..cda7ba8673 100644 --- a/wmake/rules/solarisGcc/general +++ b/wmake/rules/solarisGcc/general @@ -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