exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/hotfix/gcc46' into HrvojeJasak

Browse source
This commit is contained in:
Hrvoje Jasak 2012-03-05 14:57:57 +00:00
commit 4ce097de54
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wmake/rules/linux64Gcc/c
View file

@ -13,4 +13,4 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG) LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

4
wmake/rules/linux64Gcc/c++
View file

@ -17,5 +17,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) -lrt LINK_LIBS = $(c++DBUG) -lrt
LINKLIBSO = $(CC) $(c++FLAGS) -shared LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

2
wmake/rules/linux64Gcc/general
View file

@ -1,4 +1,4 @@
CPP = cpp -P $(GFLAGS) CPP = cpp -traditional-cpp
LD = ld LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl

2
wmake/rules/linuxGcc/c
View file

@ -13,4 +13,4 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
LINK_LIBS = $(cDBUG) LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

4
wmake/rules/linuxGcc/c++
View file

@ -17,5 +17,5 @@ cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG) LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

2
wmake/rules/linuxGcc/general
View file

@ -1,4 +1,4 @@
CPP = cpp $(GFLAGS) -P CPP = cpp -traditional-cpp
LD = ld -melf_i386 LD = ld -melf_i386
PROJECT_LIBS = -l$(WM_PROJECT) -ldl PROJECT_LIBS = -l$(WM_PROJECT) -ldl