Added embedded_runpath_prefix to RPATH if it's set

lidongdongsx · Sep 30, 2015 · 56b5299 · 56b5299
1 parent 8fc4ec4
commit 56b5299
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git 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)

diff --git a/python/config/Make.rules.Darwin b/python/config/Make.rules.Darwin
@@ -38,7 +38,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)

diff --git a/ruby/config/Make.rules.Darwin b/ruby/config/Make.rules.Darwin
@@ -41,7 +41,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)