From 526f767235a5d3949090573b7e239c4a2481b550 Mon Sep 17 00:00:00 2001 From: Gilles Duboscq <gilles.m.duboscq@oracle.com> Date: Sun, 8 Apr 2018 19:50:50 +0200 Subject: [PATCH] Use -p when calling mx in makefiles --- com.oracle.truffle.r.native/fficall/Makefile | 2 +- com.oracle.truffle.r.native/gnur/Makefile.libs | 2 +- com.oracle.truffle.r.native/include/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/com.oracle.truffle.r.native/fficall/Makefile b/com.oracle.truffle.r.native/fficall/Makefile index e6e0b6a202..39e23575d7 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 db85bb8d5a..04b6ee95a6 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 b0311e0450..c71e98984b 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 -- GitLab