Commit 4790d46
committed
fix(arm): keep CMakeFiles/ between make TOPP and make pyopenms
After the two-pass cmake configure landed in 5185c3e, the next
attempt got past `make -j4 TOPP` (the link error is fixed) but
failed fast in `make -j4 pyopenms` with:
CMake Error: Not a file: /openms-build/CMakeFiles/VerifyGlobs.cmake
CMake Error: Error processing file: /openms-build/CMakeFiles/VerifyGlobs.cmake
make: *** [Makefile:11553: cmake_check_build_system] Error 1
`VerifyGlobs.cmake` is generated by cmake for `file(GLOB CONFIGURE_DEPENDS ...)`
targets and is consulted by `cmake_check_build_system` at the top of
every subsequent `make` invocation. The intermediate cleanup line
RUN rm -rf src doc CMakeFiles
deleted it, which is fine on the x86 single-pass build (different
cmake codepath when PYOPENMS=ON is set in the initial configure, no
VerifyGlobs.cmake generated) but breaks the ARM two-pass build.
Stop deleting CMakeFiles/ between `make TOPP` and `make pyopenms`.
We still drop `src/` and `doc/` for disk savings; keeping CMakeFiles
costs only a few hundred MB on the intermediate layer.1 parent 0bab3ae commit 4790d46
1 file changed
Lines changed: 10 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
112 | 121 | | |
113 | 122 | | |
114 | 123 | | |
| |||
0 commit comments