diff options
| author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2019-07-09 16:48:53 +0200 |
|---|---|---|
| committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2019-07-09 16:49:06 +0200 |
| commit | 4af03e52bdd7f4fd60a8f77d714c403d9f49177c (patch) | |
| tree | 3a6477657429f301c559f91bfbe6fa8a0602c26a /modules | |
| parent | df6d1656feaeeeea0f597b215c524dcc71f40e50 (diff) | |
Make SCons check for System MSBuild before Mono's
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mono/build_scripts/solution_builder.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/mono/build_scripts/solution_builder.py b/modules/mono/build_scripts/solution_builder.py index 9f549a10ed..147dce45d9 100644 --- a/modules/mono/build_scripts/solution_builder.py +++ b/modules/mono/build_scripts/solution_builder.py @@ -112,6 +112,11 @@ def find_msbuild_windows(env): mono_bin_dir = os.path.join(mono_root, 'bin') msbuild_mono = os.path.join(mono_bin_dir, 'msbuild.bat') + msbuild_tools_path = find_msbuild_tools_path_reg() + + if msbuild_tools_path: + return (os.path.join(msbuild_tools_path, 'MSBuild.exe'), framework_path, {}) + if os.path.isfile(msbuild_mono): # The (Csc/Vbc/Fsc)ToolExe environment variables are required when # building with Mono's MSBuild. They must point to the batch files @@ -123,11 +128,6 @@ def find_msbuild_windows(env): } return (msbuild_mono, framework_path, mono_msbuild_env) - msbuild_tools_path = find_msbuild_tools_path_reg() - - if msbuild_tools_path: - return (os.path.join(msbuild_tools_path, 'MSBuild.exe'), framework_path, {}) - return None |