core: Remove DYLD_LIBRARY_PATH if command not in installer [GH-2219]
This commit is contained in:
parent
e721960392
commit
06bf3c6fdc
|
@ -1,6 +1,8 @@
|
||||||
## 1.3.3 (unreleased)
|
## 1.3.3 (unreleased)
|
||||||
|
|
||||||
|
BUG FIXES:
|
||||||
|
|
||||||
|
- core: Fix issues with dynamic linker not finding symbols on OS X. [GH-2219]
|
||||||
|
|
||||||
## 1.3.2 (September 17, 2013)
|
## 1.3.2 (September 17, 2013)
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,19 @@ module Vagrant
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# If we're in the installer and the command is NOT included
|
||||||
|
# in the installer (external), then remove the DYLD_IMPORT_PATH
|
||||||
|
# environmental variable to run into linker issues. [GH-2219]
|
||||||
|
if Vagrant.in_installer?
|
||||||
|
installer_dir = ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"].to_s.downcase
|
||||||
|
if !@command[0].downcase.include?(installer_dir)
|
||||||
|
@logger.info("Command not in the installer. Removing DYLD_LIBRARY_PATH")
|
||||||
|
process.environment["DYLD_LIBRARY_PATH"] = ""
|
||||||
|
else
|
||||||
|
@logger.debug("Command in installer, not touching env vars.")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Start the process
|
# Start the process
|
||||||
begin
|
begin
|
||||||
SafeChdir.safe_chdir(workdir) do
|
SafeChdir.safe_chdir(workdir) do
|
||||||
|
|
Loading…
Reference in New Issue