diff options
| author | Frediano Ziglio <freddy77@gmail.com> | 2022-01-29 16:48:50 +0000 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2022-03-24 12:37:26 +0000 |
| commit | 4a1e9a03f45770e29770b2eea3d996eb2972599c (patch) | |
| tree | 56ae755be077679c9e8dedf2f101b61da87ede99 | |
| parent | a73b82fc18af9b3e11f2808de54fbcc8d57cc250 (diff) | |
ci: Workaround a bug in Fedora 35 mingw64-make script
mingw64-make is a bash script that wraps make command passing
additional arguments and setup in order to cross compiler for
MingW (to target Windows).
In Fedora 35 the script passes the arguments we provide
twice. So if we pass (like in this case)
"LOG_COMPILE=wine -C server check" the final make command will
receive
"LOG_COMPILE=wine -C server check LOG_COMPILE=wine -C server check"
arguments.
This for some arguments it's not a problem but passing "-C <dir>"
twice causes make to attempt to change directory twice.
This causes a
make: *** server: No such file or directory. Stop.
error. Use cd command before invoking mingw64-make to avoid
having to pass "-C" option.
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a36d012c..844e1691 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,7 @@ makecheck-windows: - mingw64-make - export G_TLS_GNUTLS_PRIORITY="NORMAL:%COMPAT" - export WINEPATH='Z:\usr\x86_64-w64-mingw32\sys-root\mingw\bin' - - mingw64-make LOG_COMPILE=wine -C server check || (cat server/tests/test-suite.log && exit 1) + - (cd server && exec mingw64-make LOG_COMPILE=wine check) || (cat server/tests/test-suite.log && exit 1) websocket-autobahn: before_script: |