haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: set the DYLD_LIBRARY_PATH before other env vars

This commit is contained in:
Mitchell Hashimoto 2013-09-18 09:42:18 -07:00
parent 7c3b342add
commit 5b2a28cd4c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/vagrant/util/subprocess.rb
View File

@ -73,13 +73,6 @@ module Vagrant
process.io.stderr = stderr_writer process.io.stderr = stderr_writer
process.duplex = true process.duplex = true
# Set the environment on the process if we must
if @options[:env]
@options[:env].each do |k, v|
process.environment[k] = v
end
end
# If we're in the installer and the command is NOT included # If we're in the installer and the command is NOT included
# in the installer (external), then remove the DYLD_IMPORT_PATH # in the installer (external), then remove the DYLD_IMPORT_PATH
# environmental variable to run into linker issues. [GH-2219] # environmental variable to run into linker issues. [GH-2219]
@ -94,6 +87,13 @@ module Vagrant
end end
end end
# Set the environment on the process if we must
if @options[:env]
@options[:env].each do |k, v|
process.environment[k] = v
end
end
# Start the process # Start the process
begin begin
SafeChdir.safe_chdir(workdir) do SafeChdir.safe_chdir(workdir) do