From d56cf40dd7915bf9fd0940ad7e86f0e5e84580d6 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 4 Jun 2024 12:27:29 +0200
Subject: [PATCH] mkosi: Build Arch Linux image with -D_FORTIFY_SOURCE=3

_FORTIFY_SOURCE requires optimizations to be enabled so we set -O2
as well.
---
 .github/workflows/mkosi.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index a50798b2f14..cfdfa8eba05 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -58,30 +58,37 @@ jobs:
             release: rolling
             sanitizers: ""
             llvm: 0
+            cflags: "-O2 -D_FORTIFY_SOURCE=3"
           - distro: debian
             release: testing
             sanitizers: ""
             llvm: 0
+            cflags: "-Og"
           - distro: ubuntu
             release: noble
             sanitizers: ""
             llvm: 0
+            cflags: "-Og"
           - distro: fedora
             release: "40"
             sanitizers: ""
             llvm: 0
+            cflags: "-Og"
           - distro: fedora
             release: rawhide
             sanitizers: address,undefined
             llvm: 1
+            cflags: "-Og"
           - distro: opensuse
             release: tumbleweed
             sanitizers: ""
             llvm: 0
+            cflags: "-Og"
           - distro: centos
             release: "9"
             sanitizers: ""
             llvm: 0
+            cflags: "-Og"
 
     steps:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
@@ -127,8 +134,7 @@ jobs:
         Environment=
                 # Build debuginfo packages since we'll be publishing the packages as artifacts.
                 WITH_DEBUG=1
-                # Enabling optimizations significantly speeds up integration tests.
-                CFLAGS=-Og
+                CFLAGS="${{ matrix.cflags }}"
                 SANITIZERS=${{ matrix.sanitizers }}
                 MESON_OPTIONS=--werror
                 LLVM=${{ matrix.llvm }}
-- 
2.47.3