diff options
| author | Ralph Giles <giles@thaumas.net> | 2020-06-14 12:02:50 +0300 |
|---|---|---|
| committer | Ralph Giles <giles@thaumas.net> | 2020-06-14 12:02:50 +0300 |
| commit | e25a093a62c9958edf2c010d954eb0bdba7f63b2 (patch) | |
| tree | 29b0c20fe1e1648fa6b40642afb3ac3f1fed5b2e | |
| parent | 438a3ed7a10b38c5b7093f860e9caf0b7e36e5e1 (diff) | |
gitlab-ci: Distinguish make and compiler flags.
Passing everything to `make` works as intended, but CFLAGS
is also set in the environment and gets passed on to the
compiler invocations, where Makefile-specific switches
like FIXED_POINT=1 aren't understood.
Instead, set separate variables and only pass FLAGS explicitly,
relying on the Makefile to pass through CFLAGS from the environment.
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a921e69..c3b37131 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,9 +29,9 @@ cmake: .make: stage: build script: - - make -f Makefile.unix ${CFLAGS} - - make -f Makefile.unix ${CFLAGS} check - - make -f Makefile.unix ${CFLAGS} clean + - make -f Makefile.unix ${FLAGS} + - make -f Makefile.unix ${FLAGS} check + - make -f Makefile.unix ${FLAGS} clean make.float: extends: .make @@ -49,9 +49,10 @@ make.float.vararrays: make.fixed: extends: .make variables: - CFLAGS: FIXED_POINT=1 + FLAGS: FIXED_POINT=1 make.fixed.vararrays: extends: .make variables: - CFLAGS: FIXED_POINT=1 -DVAR_ARRAYS + FLAGS: FIXED_POINT=1 + CFLAGS: -DVAR_ARRAYS |