diff options
| author | Jose <jose@zeroc.com> | 2014-11-28 15:34:17 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-28 15:34:17 +0100 |
| commit | 47e05ffb78bb4542bb1714afc7d6439f1ba2475e (patch) | |
| tree | 42bc6de9433213722c0ca688e802aff637ad8bd3 /cpp | |
| parent | Demoscript fixes, add ThirdParty bin to path when required (diff) | |
| download | ice-47e05ffb78bb4542bb1714afc7d6439f1ba2475e.tar.bz2 ice-47e05ffb78bb4542bb1714afc7d6439f1ba2475e.tar.xz ice-47e05ffb78bb4542bb1714afc7d6439f1ba2475e.zip | |
RPATH build fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index 4df0b1d46df..4b99e81a0a7 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -55,26 +55,26 @@ ifeq ($(embedded_runpath),yes) # If embedded_runpath_prefix is set it has preference # ifneq ($(embedded_runpath_prefix),) - RPATH_DIR = $(embedded_runpath_prefix) + RPATH_DIR = $(embedded_runpath_prefix) endif ifeq ($(RPATH_DIR),) - ifdef ice_src_dist - RPATH_DIR = @loader_path/$(libdir) - else - RPATH_DIR = $(ice_dir)/$(libsubdir) - endif + ifdef ice_src_dist + RPATH_DIR = @loader_path/$(libdir) + else + RPATH_DIR = $(ice_dir)/$(libsubdir) + endif endif # # Clear rpath setting when doing a system install # ifeq ($(ice_dir),/usr) - RPATH_DIR = + RPATH_DIR = endif ifneq ($(RPATH_DIR),) - LDEXEFLAGS = -Wl,-rpath,$(RPATH_DIR) + LDEXEFLAGS = -Wl,-rpath,$(RPATH_DIR) endif endif |