diff options
author | Katelyn Gadd <kg@luminance.org> | 2018-08-02 01:30:54 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-08-02 01:30:54 +0300 |
commit | feaf8ee391a09fbff2137905ac7139f9bacc99fa (patch) | |
tree | 454454ea017e91e470c79d61cf87fd63bc0ba3d3 /Makefile.am | |
parent | 09c0cc5fca642a2c9f3f8d2ef086b9d4e7e9ee0b (diff) |
Use msbuild project reference to establish dependency on genconsts instead of solution dependencies (#9670)
Using solution dependencies in ```bcl.sln``` seems flaky and seems like it might not establish the full ordering we need to ensure that ```Consts.cs``` exists before we build things that require it. Let's try using project references (where ```corlib.dll``` 'depends' on ```genconsts.exe```) instead. This should also insert the dependency for any project that includes Consts.cs instead of just corlib.
This PR also makes update-solution-files actually fail if ```genconsts.exe``` fails to build because it was driving me mad.
Part of #6886
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 16492d83674..9f89c00e920 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,7 +145,7 @@ update-llvm-version: update-solution-files: - (pushd msvc/scripts; rm genproj.exe; $(MAKE) genproj.exe; popd) + cd msvc/scripts && $(MAKE) genproj.exe || exit $$?; $(MAKE) update-csproj $(MAKE) package-inputs (cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS)) |