diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-07-21 20:49:26 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2016-07-21 20:49:26 +0300 |
| commit | d8d1fe64c14111dab63a99c3670115928dc6226b (patch) | |
| tree | 7bf72c4d8aa7df3287a11bb7019ef6f3f564ceb2 /llvm | |
| parent | 635799108ea66412a1f80ae3cb82e8465198e773 (diff) | |
[versions.mk] Make path to SUBMODULES.json based on srcdir (#3314)
Since acceptance-tests/Makefile (and llvm/Makefile) include scripts/submodules/versions.mk which evals versions.py which looks
for a SUBMODULES.json file in the current working directory we got confusing error messages if the build directory is not the src dir:
```
Traceback (most recent call last):
File "../../mono/scripts/submodules/versions.py", line 22, in <module>
submodules = json.load(open(CONFIG_FILE))
IOError: [Errno 2] No such file or directory: 'SUBMODULES.json'
```
Instead we now pass the path to SUBMODULES.json as a variable to versions.py and set it based on $(top_srcdir) so it works
even for out-of-tree builds.
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/llvm/Makefile.am b/llvm/Makefile.am index e8004bf5cb9..cda2a5762f9 100644 --- a/llvm/Makefile.am +++ b/llvm/Makefile.am @@ -7,6 +7,7 @@ LLVM_PATH=llvm +SUBMODULES_CONFIG_FILE = $(top_srcdir)/llvm/SUBMODULES.json include $(top_srcdir)/scripts/submodules/versions.mk $(eval $(call ValidateVersionTemplate,llvm,LLVM)) |