From 5b2d6448bb2edb472094cf9ae48ea8ce768649e0 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 10 Oct 2024 11:01:35 +0200 Subject: [PATCH] GHA/mac: simplify detecting SDK version bound to GCC Previous method extracted this information from the "hack layer" headers' copyright comments. It turns out that the same information can be obtained by querying the default SDK root via a GCC option. According to this test run, they do match: https://github.com/curl/curl/actions/runs/11264283159/job/31323963221?pr=15193 Closes #15241 --- .github/workflows/macos.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8c137a1001..ffc8844365 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -159,8 +159,7 @@ jobs: - name: 'toolchain versions' run: | [[ '${{ matrix.compiler }}' = 'llvm'* ]] && CC="$(brew --prefix ${{ matrix.compiler }})/bin/clang" - [[ '${{ matrix.compiler }}' = 'gcc'* ]] && \ - grep -h -r -E -o '.+[0-9.]+\.sdk/' "$(dirname "$("${CC}" -print-libgcc-file-name)")/include-fixed" | sed -E 's/^\t+//g' | tr -d '"' | sort -u || true + [[ '${{ matrix.compiler }}' = 'gcc'* ]] && "${CC}" --print-sysroot which "${CC}"; "${CC}" --version || true xcodebuild -version || true xcrun --sdk macosx --show-sdk-path 2>/dev/null || true @@ -326,8 +325,7 @@ jobs: - name: 'toolchain versions' run: | [[ '${{ matrix.compiler }}' = 'llvm'* ]] && CC="$(brew --prefix ${{ matrix.compiler }})/bin/clang" - [[ '${{ matrix.compiler }}' = 'gcc'* ]] && \ - grep -h -r -E -o '.+[0-9.]+\.sdk/' "$(dirname "$("${CC}" -print-libgcc-file-name)")/include-fixed" | sed -E 's/^\t+//g' | tr -d '"' | sort -u || true + [[ '${{ matrix.compiler }}' = 'gcc'* ]] && "${CC}" --print-sysroot which "${CC}"; "${CC}" --version || true xcodebuild -version || true xcrun --sdk macosx --show-sdk-path 2>/dev/null || true @@ -488,8 +486,7 @@ jobs: - name: 'toolchain versions' run: | [[ '${{ matrix.compiler }}' = 'llvm'* ]] && CC="$(brew --prefix ${{ matrix.compiler }})/bin/clang" - [[ '${{ matrix.compiler }}' = 'gcc'* ]] && \ - grep -h -r -E -o '.+[0-9.]+\.sdk/' "$(dirname "$("${CC}" -print-libgcc-file-name)")/include-fixed" | sed -E 's/^\t+//g' | tr -d '"' | sort -u || true + [[ '${{ matrix.compiler }}' = 'gcc'* ]] && "${CC}" --print-sysroot which "${CC}"; "${CC}" --version || true xcodebuild -version || true xcrun --sdk macosx --show-sdk-path 2>/dev/null || true -- 2.47.3