From 065aa4aca31781ea921b50f9689726c9c32dece6 Mon Sep 17 00:00:00 2001 From: Nicklas Larsson Date: Sat, 18 Nov 2023 20:17:06 +0100 Subject: [PATCH] here we go again 2 --- .github/workflows/build_ubuntu-22.04.sh | 2 +- .github/workflows/gcc.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_ubuntu-22.04.sh b/.github/workflows/build_ubuntu-22.04.sh index a190d641f4c..67f59fe822b 100755 --- a/.github/workflows/build_ubuntu-22.04.sh +++ b/.github/workflows/build_ubuntu-22.04.sh @@ -21,7 +21,7 @@ fi # errors out. This may be removed with upgraded configure.in file. makecmd="make" if [[ "$#" -eq 2 ]]; then - makecmd="make CFLAGS='$CFLAGS -isystem/usr/include $2' CXXFLAGS='$CXXFLAGS -isystem/usr/include $2'" + makecmd="make CFLAGS='$CFLAGS -isystem/usr/include/gdal $2 $3' CXXFLAGS='$CXXFLAGS -isystem/usr/include/gdal $2 $3'" fi # non-existent variables as an errors diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml index 9518ff9aeed..dfaae0f5e83 100644 --- a/.github/workflows/gcc.yml +++ b/.github/workflows/gcc.yml @@ -58,4 +58,4 @@ jobs: # TODO: -pedantic-errors here won't compile CXXFLAGS: -std=${{ matrix.cpp }} -fPIC -Wall -Wextra # CPPFLAGS: -isystem/usr/include - run: .github/workflows/build_ubuntu-22.04.sh $HOME/install -Wpedantic + run: .github/workflows/build_ubuntu-22.04.sh $HOME/install -Wpedantic -Werror