diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-09-30 13:47:53 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-09-30 13:47:53 +0200 |
| commit | 56b52991eb34c9645cf7229a0cb49c5324a7d0cb (patch) | |
| tree | 0b8ef319a9fc9cb7d4b25c97504898df78799cf8 /php | |
| parent | Fixed ICE-6824 - timeout test failure on SLES12 (diff) | |
| download | ice-56b52991eb34c9645cf7229a0cb49c5324a7d0cb.tar.bz2 ice-56b52991eb34c9645cf7229a0cb49c5324a7d0cb.tar.xz ice-56b52991eb34c9645cf7229a0cb49c5324a7d0cb.zip | |
Added embedded_runpath_prefix to RPATH if it's set
Diffstat (limited to 'php')
| -rw-r--r-- | php/config/Make.rules.Darwin | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/php/config/Make.rules.Darwin b/php/config/Make.rules.Darwin index 4dc01228b35..98adb4a6416 100644 --- a/php/config/Make.rules.Darwin +++ b/php/config/Make.rules.Darwin @@ -33,7 +33,9 @@ ifneq ($(STATICLIBS),yes) # of relying on the RPATH set during the build (which isn't correct anymore for the # installation directly layout). # - ifdef usr_dir_install + ifneq ($(embedded_runpath_prefix),) + installlib += ; install_name_tool -rpath $(RPATH_DIR) $(embedded_runpath_prefix) $(1)/$(3) + else ifdef usr_dir_install installlib += ; install_name_tool -delete_rpath $(RPATH_DIR) $(1)/$(3) else ifdef ice_src_dist installlib += ; install_name_tool -rpath $(RPATH_DIR) @loader_path/../$(libsubdir) $(1)/$(3) |