Skip to content
Snippets Groups Projects
Commit 2708809e authored by Danilo Ansaloni's avatar Danilo Ansaloni
Browse files

[GR-6993] Use -p when calling mx in makefiles.

PullRequest: fastr/1499
parents 0ca8a63e ac7fed68
No related branches found
No related tags found
No related merge requests found
...@@ -71,7 +71,7 @@ ifeq ($(OS_NAME),Darwin) ...@@ -71,7 +71,7 @@ ifeq ($(OS_NAME),Darwin)
for pkgname in $(GNUR_RECOMMENDED_PKGNAMES); do \ for pkgname in $(GNUR_RECOMMENDED_PKGNAMES); do \
if [ -e $(FASTR_R_HOME)/library/$$pkgname/libs/$$pkgname.so ] ; then \ if [ -e $(FASTR_R_HOME)/library/$$pkgname/libs/$$pkgname.so ] ; then \
install_name_tool -id @rpath/../library/$$pkgname/libs/$$pkgname.so $(FASTR_R_HOME)/library/$$pkgname/libs/$$pkgname.so; \ install_name_tool -id @rpath/../library/$$pkgname/libs/$$pkgname.so $(FASTR_R_HOME)/library/$$pkgname/libs/$$pkgname.so; \
mx rupdatelib $(FASTR_R_HOME)/library/$$pkgname/libs; \ mx -p $(FASTR_R_HOME) rupdatelib $(FASTR_R_HOME)/library/$$pkgname/libs; \
fi \ fi \
done done
endif endif
......
...@@ -67,7 +67,7 @@ endif ...@@ -67,7 +67,7 @@ endif
install_name_tool -change libRlapack.dylib @rpath/libRlapack.dylib $(R_LIB) install_name_tool -change libRlapack.dylib @rpath/libRlapack.dylib $(R_LIB)
install_name_tool -id @rpath/libR.dylib $(R_LIB) install_name_tool -id @rpath/libR.dylib $(R_LIB)
# check if we captured libpcre/libz, rpath those in libR # check if we captured libpcre/libz, rpath those in libR
mx rupdatelib $(FASTR_LIB_DIR) mx -p $(FASTR_R_HOME) rupdatelib $(FASTR_LIB_DIR)
else else
FASTR_RFFI="nfi-only" $(DYLIB_LD) $(DYLIB_LDFLAGS) $(shell echo $(PKG_LDFLAGS_OVERRIDE)) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -ldl -lpcre -lz FASTR_RFFI="nfi-only" $(DYLIB_LD) $(DYLIB_LDFLAGS) $(shell echo $(PKG_LDFLAGS_OVERRIDE)) -Wl,-rpath,'$$ORIGIN' -o $(R_LIB) $(wildcard lib/*.o) -L$(FASTR_LIB_DIR) -lRblas -lRlapack -ldl -lpcre -lz
ifeq ($(FASTR_RFFI),llvm) ifeq ($(FASTR_RFFI),llvm)
......
...@@ -65,7 +65,7 @@ endif ...@@ -65,7 +65,7 @@ endif
# file to indicate that the check has been done. # file to indicate that the check has been done.
rcopylib.done: rcopylib.done:
for target in $(OTHER_LIB_TARGETS); do \ for target in $(OTHER_LIB_TARGETS); do \
mx rcopylib $$target $(FASTR_LIB_DIR) || exit 1; \ mx -p $(FASTR_R_HOME) rcopylib $$target $(FASTR_LIB_DIR) || exit 1; \
done done
touch rcopylib.done touch rcopylib.done
......
...@@ -47,7 +47,7 @@ all: linked ...@@ -47,7 +47,7 @@ all: linked
linked: linked:
mkdir -p R_ext mkdir -p R_ext
$(foreach file,$(R_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/$(file) $(file);) $(foreach file,$(R_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/$(file) $(file);)
mx edinclude $(GNUR_HOME)/include mx -p $(FASTR_R_HOME) edinclude $(GNUR_HOME)/include
$(foreach file,$(R_EXT_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/R_ext/$(file) R_ext/$(file);) $(foreach file,$(R_EXT_HEADERS_TO_LINK),ln -sf $(GNUR_HOME)/include/R_ext/$(file) R_ext/$(file);)
# cp $(R_EXT_HEADERS_LOCAL) R_ext # cp $(R_EXT_HEADERS_LOCAL) R_ext
touch linked touch linked
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment