diff --git a/lib/omnibus/builder.rb b/lib/omnibus/builder.rb index efefdd450..c64272fd2 100644 --- a/lib/omnibus/builder.rb +++ b/lib/omnibus/builder.rb @@ -209,14 +209,16 @@ def configure(*args) # arrive at differently terrible wild ass guesses for what MSYSTEM=MINGW64 # means. This can be anything from x86_64-pc-mingw64 to i686-pc-mingw32 # which doesn't even make any sense... - if windows? + no_force_build = options.delete(:no_build_triplet) || false + if windows? && !no_force_build platform = windows_arch_i386? ? "i686-w64-mingw32" : "x86_64-w64-mingw32" configure_cmd << "--build=#{platform}" end # Accept a prefix override if provided. Can be set to '' to suppress # this functionality. - prefix = options.delete(:prefix) || "#{install_dir}/embedded" + default_prefix = if !windows? then "#{install_dir}/embedded" else python_3_embedded end + prefix = options.delete(:prefix) || default_prefix configure_cmd << "--prefix=#{prefix}" if prefix && prefix != "" configure_cmd.concat args