Skip to content

configure: use the expected default value for windows prefix #216

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
chouquette merged 3 commits into from
Dec 23, 2024
Merged

configure: use the expected default value for windows prefix #216

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d143d77
use the expected default value for windows prefix
chouquette Dec 20, 2024
1920385
allow --build to be ommited from configure args
chouquette Dec 20, 2024
217743f
replace unless with if not
chouquette Dec 20, 2024
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
6 changes: 4 additions & 2 deletions lib/omnibus/builder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading