From 4d6c58393f37ab4af6ffd396ff6541041bf1d163 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 27 Mar 2003 15:34:56 +0000
Subject: [PATCH]  Moved RUNTIME_LDFLAGS defintion.

---
 config/CONFIG.Host.Linux      | 5 +++++
 config/CONFIG.Host.cygwin32   | 6 ++++++
 config/CONFIG.Host.hp700      | 5 +++++
 config/CONFIG.Host.solaris    | 6 ++++++
 config/CONFIG.Host.solarisGnu | 5 +++++
 config/CONFIG.Host.sun4       | 3 +++
 config/CONFIG_COMMON          | 5 -----
 7 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/config/CONFIG.Host.Linux b/config/CONFIG.Host.Linux
index af369e157..1e4496bc0 100644
--- a/config/CONFIG.Host.Linux
+++ b/config/CONFIG.Host.Linux
@@ -47,4 +47,9 @@ SYS_DLL_LIBS_Linux += pthread readline curses rt
 #	and see if that makes the problem go away."
 #ARCH_DEP_CFLAGS += -D_GNU_SOURCE
 
+# Runtime ldflags
+RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
+RUNTIME_LDFLAGS = $(RUNTIME_LIBS:%=-Wl,-rpath,%)
+
 
diff --git a/config/CONFIG.Host.cygwin32 b/config/CONFIG.Host.cygwin32
index b2a9a3919..9fe9d4c48 100644
--- a/config/CONFIG.Host.cygwin32
+++ b/config/CONFIG.Host.cygwin32
@@ -42,3 +42,9 @@ GCC_DEP_CFLAGS = -D_REENTRANT
 G++_DEP_CFLAGS = -D_REENTRANT
 
 POSIX_CPPFLAGS_YES = -D_POSIX_SOURCE
+
+# Runtime ldflags
+RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
+RUNTIME_LDFLAGS = $(RUNTIME_LIBS:%=-Wl,-rpath,%)
+
diff --git a/config/CONFIG.Host.hp700 b/config/CONFIG.Host.hp700
index 3947091a5..655b34786 100644
--- a/config/CONFIG.Host.hp700
+++ b/config/CONFIG.Host.hp700
@@ -87,3 +87,8 @@ ARCH_DEP_CXXFLAGS = -D_HPUX_SOURCE -DHP_UX
 ARCH_DEP_LDLIBS =
 ARCH_DEP_LDFLAGS = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s
 
+# Runtime ldflags
+RUNTIME_LIBS =$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
+RUNTIME_LDFLAGS = $(RUNTIME_LIBS:%=-Wl,-rpath,%)
+
diff --git a/config/CONFIG.Host.solaris b/config/CONFIG.Host.solaris
index e89535bf3..f5cf4d59f 100644
--- a/config/CONFIG.Host.solaris
+++ b/config/CONFIG.Host.solaris
@@ -78,3 +78,9 @@ ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
+
+# Runtime ldflags
+RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
+
+
diff --git a/config/CONFIG.Host.solarisGnu b/config/CONFIG.Host.solarisGnu
index eb86364de..1d93d2d18 100644
--- a/config/CONFIG.Host.solarisGnu
+++ b/config/CONFIG.Host.solarisGnu
@@ -46,3 +46,8 @@ ARCH_DEP_LDLIBS += $(ARCH_DEP_LDLIBS_$(SOLARIS_VERSION))
 #Allows R3.13 built extensions to load R3.14 shared libs
 SYS_DLL_LIBS_solaris_8 = Crun
 SYS_DLL_LIBS_solaris += posix4 pthread $(SYS_DLL_LIBS_solaris_$(SOLARIS_VERSION))
+
+# Runtime ldflags
+RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
+
diff --git a/config/CONFIG.Host.sun4 b/config/CONFIG.Host.sun4
index 500486e3e..170b259c7 100644
--- a/config/CONFIG.Host.sun4
+++ b/config/CONFIG.Host.sun4
@@ -93,3 +93,6 @@ ARCH_DEP_CFLAGS = -DSUNOS4
 #SPECIAL_LANG = /usr/lang/SC3.0.1
 #SPECIAL_LANG = /usr/lang/lib
 
+# Runtime ldflags
+RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
+ $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON
index 9112b78ee..2b9e9080e 100644
--- a/config/CONFIG_COMMON
+++ b/config/CONFIG_COMMON
@@ -215,11 +215,6 @@ STATIC_CXXCFLAGS = $($(CPLUSPLUS)_SFLAGS_$(STATIC_BUILD))
 STATIC_LDFLAGS = $($(ANSI)_SLDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $($(ANSI)_SLIBS_$(STATIC_BUILD))
 
-#--------------------------------------------------
-# Runtime ldflags
-RUNTIME_LDFLAGS =$(addprefix -R,$(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)\
- $(EPICS_EXTENSIONS)/lib/$(EPICS_HOST_ARCH))
-
 #--------------------------------------------------
 # ar definition default
 ARCMD = $(AR) $(ARFLAGS) $@