diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 22:36:15 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 22:36:15 +0200 |
commit | f48a1c9ebf8a57d7680f263467501f595192e30f (patch) | |
tree | 9270ea19cafbd2066f8a501fe118d2a95c58daa4 /platform | |
parent | cc30e2a9a503f4b13eb25af2a552a029d6de815b (diff) |
Buildsystem: Windows cross-compilation on Linux defaults to 64-bit
Diffstat (limited to 'platform')
-rw-r--r-- | platform/windows/detect.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index a7cca23973..5bd9a78f49 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -226,10 +226,13 @@ def configure(env): else: env["PROGSUFFIX"] = env["PROGSUFFIX"] + ".exe" # for linux cross-compilation - mingw_prefix = "" - if (env["bits"] == "default"): - env["bits"] = "64" if "PROGRAMFILES(X86)" in os.environ else "32" + if (os.name == "nt"): + env["bits"] = "64" if "PROGRAMFILES(X86)" in os.environ else "32" + else: # default to 64-bit on Linux + env["bits"] = "64" + + mingw_prefix = "" if (env["bits"] == "32"): env.Append(LINKFLAGS=['-static']) |