Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #21

Merged
merged 2 commits into from Feb 8, 2016
Merged

Fixes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d26a9
Add missing LDFLAGS
ellert Feb 7, 2016
37aa434
Exclude varibles containing the install directory
ellert Feb 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makevars
View file
Open in desktop
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/tools/RInsideEnvVars.r
View file
Open in desktop
Expand Up @@ -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") {
Expand Down