diff options
| -rw-r--r-- | moz/extractfiles.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 1a8b80d3ac48..4741ff43bdef 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -350,7 +350,14 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip .IF "$(OS)"=="MACOSX" $(PERL) $(SOLARENV)$/bin$/macosx-change-install-names.pl extshl OOO \ $(RUNTIME_DIR)$/*$(DLLPOST) -# A crude hack to adapt all the install names in the components subdir: +# A crude hack to adapt all the absolute ("@executable_path") dependencies to +# relative ("@loader_path") ones: + $(foreach,file,$(shell ls $(RUNTIME_DIR)$/components$/*$(DLLPOST)) \ + install_name_tool \ + -change @executable_path/libnspr4.dylib @loader_path/libnspr4.dylib \ + -change @executable_path/libplc4.dylib @loader_path/libplc4.dylib \ + -change @executable_path/libplds4.dylib @loader_path/libplds4.dylib \ + $(file) &&) true $(foreach,file,$(shell ls $(RUNTIME_DIR)$/components$/*$(DLLPOST)) \ install_name_tool \ -change @executable_path/libldap50.dylib \ @@ -373,6 +380,8 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip -change @executable_path/libxpcom.dylib @loader_path/../libxpcom.dylib \ -change @executable_path/libxpcom_compat.dylib \ @loader_path/../libxpcom_compat.dylib \ + -change @executable_path/libxpcom_core.dylib \ + @loader_path/../libxpcom_core.dylib \ $(file) &&) true .ENDIF |