From 6e2ee7d71db9cb0343bb9ed65fb779a20643cc07 Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Sun, 13 Jul 2014 07:20:15 +0000
Subject: [PATCH] linking tweak by Yavor Doganov

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37988 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog    | 5 +++++
 base.make.in | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59bad2a0f..13fced965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-13 Yavor Doganov  <yavor@gnu.org>
+
+	* base.make.in: make base dependencies explicit only when statically
+	linnking (bug #42423)
+
 2014-06-30 Yavor Doganov  <yavor@gnu.org>
 
 	* GNUmakefile: Use -include for deb.make (for backward compatibility
diff --git a/base.make.in b/base.make.in
index a1cbc00bb..2a9575eaa 100644
--- a/base.make.in
+++ b/base.make.in
@@ -29,9 +29,11 @@ ifeq ($(BASE_MAKE_LOADED),)
     #
     AUXILIARY_OBJCFLAGS += @NX_CONST_STRING_OBJCFLAGS@
 
-    CONFIG_SYSTEM_LIBS += @LIBS@
-    CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
-    CONFIG_SYSTEM_INCL += @CPPFLAGS@
+    ifeq ($(shared),no)
+      CONFIG_SYSTEM_LIBS += @LIBS@
+      CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
+      CONFIG_SYSTEM_INCL += @CPPFLAGS@
+    endif
 
     GNUSTEP_BASE_VERSION = @VERSION@
     GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@