diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile index e6e0b6a202f5e7ebfec8c341944fe6501e0b5d8d..39e23575d7be05dff093931a90032816a9d7642e 100644 --- a/com.oracle.truffle.r.native/fficall/Makefile +++ b/com.oracle.truffle.r.native/fficall/Makefile @@ -62,7 +62,7 @@ ifneq ($(FASTR_RFFI),llvm) install_name_tool -change libRlapack.dylib @rpath/libRlapack.dylib $(R_LIB) install_name_tool -id @rpath/libR.dylib $(R_LIB) # check if we captured libpcre/libz, rpath those in libR - mx rupdatelib $(FASTR_LIB_DIR) + mx -p $(FASTR_R_HOME) rupdatelib $(FASTR_LIB_DIR) endif else $(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 diff --git a/com.oracle.truffle.r.native/gnur/Makefile.libs b/com.oracle.truffle.r.native/gnur/Makefile.libs index db85bb8d5a0a65d62ee043eb71f4e7cc24c93a09..04b6ee95a6262321801d0fd59ff363695c5ed7f7 100644 --- a/com.oracle.truffle.r.native/gnur/Makefile.libs +++ b/com.oracle.truffle.r.native/gnur/Makefile.libs @@ -65,7 +65,7 @@ endif # file to indicate that the check has been done. rcopylib.done: 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 touch rcopylib.done diff --git a/com.oracle.truffle.r.native/include/Makefile b/com.oracle.truffle.r.native/include/Makefile index b0311e0450c74e20b2a74a1eb8a3bd58dde6bf56..c71e98984b882186690b403c556bc496d4def1d7 100644 --- a/com.oracle.truffle.r.native/include/Makefile +++ b/com.oracle.truffle.r.native/include/Makefile @@ -47,7 +47,7 @@ all: linked linked: mkdir -p R_ext $(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);) # cp $(R_EXT_HEADERS_LOCAL) R_ext touch linked