Skip to content

Add CFLAGS and instruct nokogiri to use installer libraries. #104

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.

Sign up for GitHub

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

Merged
chrisroberts merged 1 commit into from
May 18, 2017
Merged

Add CFLAGS and instruct nokogiri to use installer libraries. #104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion substrate/launcher/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,20 @@ func main() {

// Setup the CPP/LDFLAGS so that native extensions can be
// properly compiled into the Vagrant environment.
cppflags := "-I" + filepath.Join(embeddedDir, "include")
cppflags := "-I" + filepath.Join(embeddedDir, "include") +
filepath.Join(embeddedDir, "include", "libxml2")
ldflags := "-L" + filepath.Join(embeddedDir, "lib")
if original := os.Getenv("CPPFLAGS"); original != "" {
cppflags = original + " " + cppflags
}
if original := os.Getenv("LDFLAGS"); original != "" {
ldflags = original + " " + ldflags
}
cflags := "-I" + filepath.Join(embeddedDir, "include") +
filepath.Join(embeddedDir, "include", "libxml2")
if original := os.Getenv("CFLAGS"); original != "" {
cflags = original + " " + cflags
}

// Set the PATH to include the proper paths into our embedded dir
path = os.Getenv("PATH")
Expand All @@ -126,13 +132,18 @@ func main() {
// Setup the environment to prefer our embedded dir over
// anything the user might have setup on his/her system.
"CPPFLAGS": cppflags,
"CFLAGS": cflags,
"GEM_HOME": filepath.Join(embeddedDir, "gems"),
"GEM_PATH": filepath.Join(embeddedDir, "gems"),
"GEMRC": filepath.Join(embeddedDir, "etc", "gemrc"),
"LDFLAGS": ldflags,
"PATH": path,
"SSL_CERT_FILE": sslCertFile,

// Instruct nokogiri installations to use libraries provided
// by the installer
"NOKOGIRI_USE_SYSTEM_LIBRARIES": "true",

// Environmental variables used by Vagrant itself
"VAGRANT_EXECUTABLE": vagrantExecutable,
"VAGRANT_INSTALLER_ENV": "1",
Expand Down