Skip to content
Snippets Groups Projects
Commit 90b8c86d authored by Steffen Müthing's avatar Steffen Müthing
Browse files

[!47] Allow jobs to pass additional compiler flags

Merge branch 'allow-duneci-compiler-flags' into 'master'

ref:docker/ci Jobs can pass these additional flags in the variables
DUNECI_CFLAGS and DUNECI_CXXFLAGS. This is similar to what is already possible
with DUNECI_CMAKE_FLAGS, except that that variable cannot be used to pass
additional compiler flags.

This is meant for flags that select particular sub-achitectures such as
-march. Jobs still need to make sure to select a suitable runner actually
supporting those architectures via runner tags.

Addresses: [core/dune-common#165]

See merge request [!47]

  [core/dune-common#165]: gitlab.dune-project.org/core/dune-common/issues/165
  [!47]: gitlab.dune-project.org/docker/ci/merge_requests/47
parents 8222efee ffff8ea1
No related branches found
No related tags found
1 merge request!47Allow jobs to pass additional compiler flags
Pipeline #19365 passed
......@@ -38,8 +38,8 @@ source ~/toolchains/${toolchain}
CMAKE_FLAGS=""
CMAKE_FLAGS+=" -DCMAKE_C_COMPILER=$CC"
CMAKE_FLAGS+=" -DCMAKE_CXX_COMPILER=$CXX"
CMAKE_FLAGS+=" -DCMAKE_C_FLAGS='${CFLAGS}'"
CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS='${CXXFLAGS}'"
CMAKE_FLAGS+=" -DCMAKE_C_FLAGS='${CFLAGS} ${DUNECI_CFLAGS:-}'"
CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS='${CXXFLAGS} ${DUNECI_CXXFLAGS:-}'"
CMAKE_FLAGS+=" -DCMAKE_BUILD_TYPE=Release"
CMAKE_FLAGS+=" -DCMAKE_C_FLAGS_RELEASE='${REL_CFLAGS}'"
CMAKE_FLAGS+=" -DCMAKE_CXX_FLAGS_RELEASE='${REL_CXXFLAGS}'"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment