From 07bf5ccf2f037a03eb310fa19a3e8d0e85b889d9 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 25 Oct 2011 15:24:44 +0100 Subject: [PATCH] COMP: wmake/rules/linuxGcc: explicit support for indirect linking --- wmake/rules/linux64Gcc/c++ | 4 ++-- wmake/rules/linux64Gcc45/c++ | 4 ++-- wmake/rules/linux64Gcc46/c++ | 4 ++-- wmake/rules/linuxGcc/c++ | 4 ++-- wmake/rules/linuxGcc45/c++ | 4 ++-- wmake/rules/linuxGcc46/c++ | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++ index 520e39c3..3dfb0333 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/linux64Gcc45/c++ b/wmake/rules/linux64Gcc45/c++ index 3ca193e2..98b25ed1 100644 --- a/wmake/rules/linux64Gcc45/c++ +++ b/wmake/rules/linux64Gcc45/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/linux64Gcc46/c++ b/wmake/rules/linux64Gcc46/c++ index 3ca193e2..98b25ed1 100644 --- a/wmake/rules/linux64Gcc46/c++ +++ b/wmake/rules/linux64Gcc46/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/linuxGcc/c++ b/wmake/rules/linuxGcc/c++ index e862181f..357f4106 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) -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/linuxGcc45/c++ b/wmake/rules/linuxGcc45/c++ index e862181f..357f4106 100644 --- a/wmake/rules/linuxGcc45/c++ +++ b/wmake/rules/linuxGcc45/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/linuxGcc46/c++ b/wmake/rules/linuxGcc46/c++ index e862181f..357f4106 100644 --- a/wmake/rules/linuxGcc46/c++ +++ b/wmake/rules/linuxGcc46/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 -- 2.11.4.GIT