diff options
| author | Adam Mitz <mitza@ociweb.com> | 2017-10-05 17:21:10 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2017-10-05 17:21:10 -0500 |
| commit | 30a3ef141df6b2477ef6d2a3439f3bda72746ec3 (patch) | |
| tree | 6448983283a3ee665d481b8607b4bd162bac00ba | |
| parent | 88ce1806d42c2635558b855b2363a7d7f5a62e66 (diff) | |
| download | ATCD-30a3ef141df6b2477ef6d2a3439f3bda72746ec3.tar.gz | |
gnuace rpath: move HP-UX settings to its own config file; support newer Apple macOS
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 12 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_hpux_aCC.GNU | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index aee6102cdb5..3449aa7e2a9 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -793,16 +793,8 @@ install: <%if(postbuild)%>__postbuild__<%else%>all<%endif%> INSTALL_LIB ?= lib ifneq ($(INSTALL_PREFIX),) ifneq ($(install_rpath),0) -UNAME := $(shell uname) -ifeq ($(UNAME), HP-UX) -LDFLAGS += -Wl,+s,+b,$(INSTALL_PREFIX)/$(INSTALL_LIB) $(LD_RPATH_FLAGS) -else -ifeq ($(UNAME), Darwin) -LDFLAGS += -Wl,-rpath $(INSTALL_PREFIX)/$(INSTALL_LIB) $(LD_RPATH_FLAGS) -else -LDFLAGS += -Wl,-R$(INSTALL_PREFIX)/$(INSTALL_LIB) $(LD_RPATH_FLAGS) -endif -endif +LD_RPATH ?= -Wl,-rpath, +LDFLAGS += $(LD_RPATH)$(INSTALL_PREFIX)/$(INSTALL_LIB) $(LD_RPATH_FLAGS) endif endif diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU index b4e9229da00..49905b45c98 100644 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU @@ -209,3 +209,5 @@ endif ifeq ($(c++0x),1) CCFLAGS += -Ax endif + +LD_RPATH = -Wl,+s,+b, |