From 42d26a9cf0c18bfdc3be125075e48b79f6476651 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 7 Feb 2016 10:00:54 +0100 Subject: [PATCH 1/2] Add missing LDFLAGS --- src/Makevars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makevars b/src/Makevars index 2b0e308..d0892ec 100644 --- a/src/Makevars +++ b/src/Makevars @@ -43,7 +43,7 @@ userLibrary: $(USERLIB) $(USERLIBST) rm $(USERLIB) $(USERLIBST) $(USERLIB): $(OBJECTS) - $(SHLIB_CXXLD) -o $(USERLIB) $^ $(SHLIB_CXXLDFLAGS) $(ALL_LIBS) + $(SHLIB_CXXLD) -o $(USERLIB) $^ $(SHLIB_CXXLDFLAGS) $(LDFLAGS) $(ALL_LIBS) @if test -e "/usr/bin/install_name_tool"; then /usr/bin/install_name_tool -id $(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB) $(USERLIB); fi $(USERLIBST): $(OBJECTS) From 37aa434b49c8a2cefe6360acea6af5b16622a9e7 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sun, 7 Feb 2016 10:02:31 +0100 Subject: [PATCH 2/2] Exclude varibles containing the install directory --- src/tools/RInsideEnvVars.r | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/RInsideEnvVars.r b/src/tools/RInsideEnvVars.r index 3d67109..236a72a 100755 --- a/src/tools/RInsideEnvVars.r +++ b/src/tools/RInsideEnvVars.r @@ -2,7 +2,7 @@ # # This owes a lot to littler.R in the littler sources -ExcludeVars <- c("R_SESSION_TMPDIR","R_HISTFILE") +ExcludeVars <- c("R_SESSION_TMPDIR","R_HISTFILE","R_LIBRARY_DIR","R_LIBS","R_PACKAGE_DIR") IncludeVars <- Sys.getenv() IncludeVars <- IncludeVars[grep("^R_",names(IncludeVars),perl=TRUE)] if (.Platform$OS.type == "windows") {