diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-10-07 09:14:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-07 09:14:18 +0100 |
| commit | f44396b9b5a3f0f7496e207a554798616fde0c7d (patch) | |
| tree | ce8e109f13ed1829edfc5baeb97b8dbe527e1bd5 | |
| parent | 40998af8327d21825b3ecd9433c85a60f4a8dc2a (diff) | |
| parent | cefeaac755c65d4a6969163733e2e92928dff849 (diff) | |
| download | ATCD-f44396b9b5a3f0f7496e207a554798616fde0c7d.tar.gz | |
Merge pull request #703 from likema/feature/rpath
Fix AIX and Solaris linking rpath errors.
| -rw-r--r-- | ACE/include/makeinclude/platform_aix_g++.GNU | 1 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_sunos5_g++.GNU | 1 |
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 |