From 8f2874056886185c7d1e00ca3c4c6e5293142784 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 9 Jul 2012 09:06:41 +0100
Subject: [PATCH] COMP: Intel: add add-needed link flags for modern linux
 platforms

---
 wmake/rules/linux64Icc/c   | 2 +-
 wmake/rules/linux64Icc/c++ | 4 ++--
 wmake/rules/linuxIcc/c     | 2 +-
 wmake/rules/linuxIcc/c++   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c
index 08ea0f8049e..1085d50498d 100644
--- a/wmake/rules/linux64Icc/c
+++ b/wmake/rules/linux64Icc/c
@@ -13,4 +13,4 @@ ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
 LINK_LIBS   = $(cDBUG) -L$(IA32ROOT)/lib
 
 LINKLIBSO   = $(cc) $(cFLAGS) -shared
-LINKEXE     = $(cc) $(cFLAGS)
+LINKEXE     = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Icc/c++ b/wmake/rules/linux64Icc/c++
index 5ad41fd9b49..dfad97cee61 100644
--- a/wmake/rules/linux64Icc/c++
+++ b/wmake/rules/linux64Icc/c++
@@ -17,5 +17,5 @@ cpptoo      = $(Ctoo)
 
 LINK_LIBS   = $(c++DBUG) -L$(IA64ROOT)/lib
 
-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/linuxIcc/c b/wmake/rules/linuxIcc/c
index 269eeaba47f..e8059d9dbb7 100644
--- a/wmake/rules/linuxIcc/c
+++ b/wmake/rules/linuxIcc/c
@@ -13,4 +13,4 @@ ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
 LINK_LIBS   = $(cDBUG) -L$(IA32ROOT)/lib
 
 LINKLIBSO   = $(cc) $(cFLAGS) -shared
-LINKEXE     = $(cc) $(cFLAGS)
+LINKEXE     = $(cc) $(cFLAGS) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxIcc/c++ b/wmake/rules/linuxIcc/c++
index 409e289014c..d06a8748485 100644
--- a/wmake/rules/linuxIcc/c++
+++ b/wmake/rules/linuxIcc/c++
@@ -19,5 +19,5 @@ cpptoo      = $(Ctoo)
 #LINK_LIBS   = $(c++DBUG) -lstdc++
 LINK_LIBS   = $(c++DBUG) -L$(IA32ROOT)/lib
 
-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
-- 
GitLab