From f48a1c9ebf8a57d7680f263467501f595192e30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 13 Sep 2017 22:36:15 +0200 Subject: Buildsystem: Windows cross-compilation on Linux defaults to 64-bit --- platform/windows/detect.py | 9 ++++++--- 1 file 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']) -- cgit v1.2.3