diff -Naurp trunk.orig/runtime/libprofile/Makefile trunk/runtime/libprofile/Makefile --- trunk.orig/runtime/libprofile/Makefile 2012-10-12 00:37:16.000000000 -0700 +++ trunk/runtime/libprofile/Makefile 2012-10-12 00:40:45.000000000 -0700 @@ -40,10 +40,12 @@ ifeq ($(HOST_OS),Darwin) -Wl,-dead_strip \ -Wl,-seg1addr -Wl,0xE0000000 - # Mac OS X 10.4 and earlier tools do not allow a second -install_name on - # command line. DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') - ifneq ($(DARWIN_VERS),8) + ifeq ($(DARWIN_VERS),8) + LLVMLibsOptions := $(LLVMLibsOptions) \ + -Wl,-dylib_install_name \ + -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" + else LLVMLibsOptions := $(LLVMLibsOptions) \ -Wl,-install_name \ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" diff -Naurp trunk.orig/tools/llvm-shlib/Makefile trunk/tools/llvm-shlib/Makefile --- trunk.orig/tools/llvm-shlib/Makefile 2012-10-12 00:37:16.000000000 -0700 +++ trunk/tools/llvm-shlib/Makefile 2012-10-12 00:39:43.000000000 -0700 @@ -54,9 +54,12 @@ ifeq ($(HOST_OS),Darwin) -Wl,-dead_strip \ -Wl,-seg1addr -Wl,0xE0000000 - # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') - ifneq ($(DARWIN_VERS),8) + ifeq ($(DARWIN_VERS),8) + LLVMLibsOptions := $(LLVMLibsOptions) \ + -Wl,-dylib_install_name \ + -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" + else LLVMLibsOptions := $(LLVMLibsOptions) \ -Wl,-install_name \ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" diff -Naurp trunk.orig/tools/lto/Makefile trunk/tools/lto/Makefile --- trunk.orig/tools/lto/Makefile 2012-10-12 00:37:16.000000000 -0700 +++ trunk/tools/lto/Makefile 2012-10-12 00:39:43.000000000 -0700 @@ -42,9 +42,12 @@ ifeq ($(HOST_OS),Darwin) -Wl,-dead_strip \ -Wl,-seg1addr -Wl,0xE0000000 - # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/') - ifneq ($(DARWIN_VERS),8) + ifeq ($(DARWIN_VERS),8) + LLVMLibsOptions := $(LLVMLibsOptions) \ + -Wl,-dylib_install_name \ + -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)" + else LLVMLibsOptions := $(LLVMLibsOptions) \ -Wl,-install_name \ -Wl,"@executable_path/../lib/lib$(LIBRARYNAME)$(SHLIBEXT)"