diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fff6c06..a1774be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,12 +19,19 @@ build:old-gcc: stage: build tags: - nix - script: + script: - nix build -L --tarball-ttl 0 --file nix/rt.nix bsc.oldOvnis +build:old-gcc-no-lto: + stage: build + tags: + - nix + script: + - nix build -L --tarball-ttl 0 --file nix/rt.nix bsc.oldOvnisNoLTO + build:rt-tests: stage: build tags: - nix - script: + script: - nix build -L --tarball-ttl 0 --file nix/rt.nix bsc.ovni-rt diff --git a/nix/rt.nix b/nix/rt.nix index c829bbd..8439066 100644 --- a/nix/rt.nix +++ b/nix/rt.nix @@ -110,6 +110,14 @@ let oldOvnis = map last.genOldOvni last.oldCompilers; + genOldOvniNoLTO = stdenv: (last.genOldOvni stdenv).overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ + "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF" + ]; + }); + + oldOvnisNoLTO = map last.genOldOvniNoLTO last.oldCompilers; + # Now we rebuild ovni with the Nanos6 and nOS-V versions, which were # linked to the previous ovni. We need to be able to exit the chroot # to run Nanos6 tests, as they require access to /sys for hwloc