Commit 55e528e9 authored by Seth Chisamore's avatar Seth Chisamore

Ensure `Config.windows_arch` is actually a symbol

parent c2c00575
......@@ -108,7 +108,7 @@ module Omnibus
# @return [String]
#
def arch
if (Ohai['platform'] == 'windows') && (Config.windows_arch == :x86)
if (Ohai['platform'] == 'windows') && (Config.windows_arch.to_sym == :x86)
'i386'
else
Ohai['kernel']['machine']
......
......@@ -502,7 +502,7 @@ module Omnibus
#
def wix_candle_flags
# we support x86 or x64. No Itanium support (ia64).
@wix_candle_flags ||= "-arch " + (Config.windows_arch == :x86 ? "x86" : "x64")
@wix_candle_flags ||= "-arch " + (Config.windows_arch.to_sym == :x86 ? "x86" : "x64")
end
#
......
......@@ -64,7 +64,7 @@ module Omnibus
# Returns whether the Windows build target is 32-bit (x86).
# If this returns false, the target is x64. Itanium is not supported.
def windows_arch_i386?
Config.windows_arch == :x86
Config.windows_arch.to_sym == :x86
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment