summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorLike Ma <likemartinma@gmail.com>2018-09-12 19:40:38 +0800
committerLike Ma <likemartinma@gmail.com>2018-09-13 12:42:24 +0800
commitcefeaac755c65d4a6969163733e2e92928dff849 (patch)
tree41dd8bf00e9941f37cf30ba7a5eb1419aa73de60 /ACE
parentd26612f464bebfc08e4318bff2ae609fa405d4b6 (diff)
downloadATCD-cefeaac755c65d4a6969163733e2e92928dff849.tar.gz
Fix AIX and Solaris linking rpath errors.
Diffstat (limited to 'ACE')
-rw-r--r--ACE/include/makeinclude/platform_aix_g++.GNU1
-rw-r--r--ACE/include/makeinclude/platform_sunos5_g++.GNU1
2 files changed, 2 insertions, 0 deletions
diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU
index 141aa9272c7..a5f876e3bf5 100644
--- a/ACE/include/makeinclude/platform_aix_g++.GNU
+++ b/ACE/include/makeinclude/platform_aix_g++.GNU
@@ -83,6 +83,7 @@ endif
LIBS += -lxti -ldl
ARFLAGS += cruv
RANLIB = ranlib
+LD_RPATH = -Wl,-R,
# Test for template instantiation, add to SOFLAGS if versioned_so set,
# add -E to LDFLAGS if using GNU ld
diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU
index 26d5603a365..f5f0b990bb6 100644
--- a/ACE/include/makeinclude/platform_sunos5_g++.GNU
+++ b/ACE/include/makeinclude/platform_sunos5_g++.GNU
@@ -44,6 +44,7 @@ RANLIB = @true
SOFLAGS += -shared $(CPPFLAGS)
SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
PRELIB = @true
+LD_RPATH = -Wl,-R,
# Get common Solaris settings
include $(ACE_ROOT)/include/makeinclude/platform_sunos5_common.GNU