[PATCH] Revert "ci: Disable optimization on macos-12"

This reverts commit 1f76b5365ec78b1e9a36038db8e13ec0025bbe7a. There were two issues with this commit. First is the missing propagation of CFLAGS into the build environment and second is the fact that this is not enough to disable the check for -fsemantic-interposition. The proper fix would require setting MESON_OPTS or similar and also add the propagation of such variable into the cirrus builds etc., but at this point I burned so much time on this trivial piece of rubbish that I think it's easier to just wait for macos to gain a newer clang =D Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- ci/gitlab/builds.yml | 1 - ci/manifest.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index f070db637c80..545478d3516d 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -865,7 +865,6 @@ aarch64-macos-12: needs: [] allow_failure: false variables: - CFLAGS: -O0 CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance diff --git a/ci/manifest.yml b/ci/manifest.yml index 2f631376b24b..b68c7361abb4 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -179,8 +179,6 @@ targets: variables: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - # Remove once macos has clang with -fsemantic-interposition - CFLAGS: -O0 ubuntu-2004: jobs: -- 2.40.0