Permalink
Browse files

(summary: for Macs, fix suitesparse build tests) altering install nam…

…e id's to use @rpath instead of @executable_path, then make @rpath a reference to @executable_path, then we can point the suitesparse build tests to the correct @rpath so that all tests work now
  • Loading branch information...
1 parent ad38d5a commit 9ab1bbab615db3a58780ab1064e268b82b5614df @vtjnash vtjnash committed Sep 6, 2012
Showing with 3 additions and 8 deletions.
  1. +2 −2 Make.inc
  2. +0 −5 Makefile
  3. +1 −1 deps/Makefile
View
@@ -187,7 +187,7 @@ endif
# OS specific stuff
# must end with a / and have no trailing spaces
-INSTALL_NAME_ID_DIR = @executable_path/../lib/
+INSTALL_NAME_ID_DIR = @rpath/
RPATH =
RPATH_ORIGIN =
@@ -225,7 +225,7 @@ endif
ifeq ($(OS), Darwin)
INSTALL_NAME_CMD = install_name_tool -id $(INSTALL_NAME_ID_DIR)
INSTALL_NAME_CHANGE_CMD = install_name_tool -change
-RPATH = -Wl,-rpath,$(BUILD)/lib
+RPATH = -Wl,-rpath,@executable_path/../lib
SHLIB_EXT = dylib
OSLIBS += -ldl -Wl,-w -framework ApplicationServices
WHOLE_ARCHIVE = -Xlinker -all_load
View
@@ -38,11 +38,6 @@ PREFIX ?= julia-$(JULIA_COMMIT)
install: release
mkdir -p $(PREFIX)/{sbin,bin,etc,lib/julia,share/julia}
cp $(BUILD)/bin/*julia* $(PREFIX)/bin
-ifeq ($(OS), Darwin)
- install_name_tool -rpath $(BUILD)/lib $(PREFIX)/lib $(PREFIX)/bin/julia-release-basic
- install_name_tool -rpath $(BUILD)/lib $(PREFIX)/lib $(PREFIX)/bin/julia-release-readline
- install_name_tool -add_rpath $(PREFIX)/lib $(PREFIX)/bin/julia-release-webserver
-endif
cd $(PREFIX)/bin && ln -s julia-release-$(DEFAULT_REPL) julia
cp -R -L $(BUILD)/lib/julia/* $(PREFIX)/lib/julia
-cp $(BUILD)/lib/lib{Rmath,amd,amos,arpack,cholmod,colamd,fdm,fftw3,fftw3f,fftw3_threads,fftw3f_threads,glpk,glpk_wrapper,gmp,gmp_wrapper,grisu,history,julia-release,$(OPENBLASNAME),openlibm,pcre,random,readline,suitesparse_wrapper,umfpack,z}.$(SHLIB_EXT) $(PREFIX)/lib
View
@@ -622,7 +622,7 @@ SUITESPARSE_OBJ_TARGET = $(USRLIB)/libumfpack.$(SHLIB_EXT)
endif
ifeq ($(OS), Darwin)
-SUITE_SPARSE_LIB = -lm
+SUITE_SPARSE_LIB = -lm -Wl,-rpath,'$(USRLIB)'
else
SUITE_SPARSE_LIB = -lm -lrt -Wl,-rpath,'$(USRLIB)'
endif

0 comments on commit 9ab1bba

Please sign in to comment.