From 93978be8f37007ccdb16e9c20adc34b9a15e03bc Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Fri, 2 Mar 2012 16:30:24 +0100 Subject: [PATCH] compiler switches for gcc 4.6 These changes probably break older gcc compilers, but I am not sure! --- wmake/rules/linux64Gcc/c | 2 +- wmake/rules/linux64Gcc/c++ | 4 ++-- wmake/rules/linux64Gcc/general | 2 +- wmake/rules/linuxGcc/c | 2 +- wmake/rules/linuxGcc/c++ | 4 ++-- wmake/rules/linuxGcc/general | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wmake/rules/linux64Gcc/c b/wmake/rules/linux64Gcc/c index 80bb80f32..f4114be31 100644 --- a/wmake/rules/linux64Gcc/c +++ b/wmake/rules/linux64Gcc/c @@ -13,4 +13,4 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ LINK_LIBS = $(cDBUG) LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++ index b68f2f7e1..72ba3bf12 100644 --- a/wmake/rules/linux64Gcc/c++ +++ b/wmake/rules/linux64Gcc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general index 41494b9dc..740c6a58a 100644 --- a/wmake/rules/linux64Gcc/general +++ b/wmake/rules/linux64Gcc/general @@ -1,4 +1,4 @@ -CPP = cpp -P $(GFLAGS) +CPP = cpp -traditional-cpp LD = ld PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl diff --git a/wmake/rules/linuxGcc/c b/wmake/rules/linuxGcc/c index 8db5da104..d914fcd37 100644 --- a/wmake/rules/linuxGcc/c +++ b/wmake/rules/linuxGcc/c @@ -13,4 +13,4 @@ ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@ LINK_LIBS = $(cDBUG) LINKLIBSO = $(cc) -shared -LINKEXE = $(cc) -Xlinker -z -Xlinker nodefs +LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index 3358676b8..7b6e69d81 100644 --- a/wmake/rules/linuxGcc/c++ +++ b/wmake/rules/linuxGcc/c++ @@ -17,5 +17,5 @@ cpptoo = $(Ctoo) LINK_LIBS = $(c++DBUG) -LINKLIBSO = $(CC) $(c++FLAGS) -shared -LINKEXE = $(CC) $(c++FLAGS) +LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed +LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general index 6616d2a10..886bf6748 100644 --- a/wmake/rules/linuxGcc/general +++ b/wmake/rules/linuxGcc/general @@ -1,4 +1,4 @@ -CPP = cpp $(GFLAGS) -P +CPP = cpp -traditional-cpp LD = ld -melf_i386 PROJECT_LIBS = -l$(WM_PROJECT) -ldl