diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-13 22:57:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 22:57:01 +0200 |
| commit | 9ac940677c9febc5f1c52782a717df61b0224344 (patch) | |
| tree | 281e78ff98fd9585795495e550f1d329ae69f115 /platform | |
| parent | cc30e2a9a503f4b13eb25af2a552a029d6de815b (diff) | |
| parent | 99c7421eae9c4e0a0bd003a416b0b786d0e19cce (diff) | |
Merge pull request #11245 from akien-mga/travis-ccache
Travis: Try enabling ccache to speed up builds
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']) |