]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
CI: brew fix for openssl in default path
authorStefan Eissing <stefan@eissing.org>
Thu, 13 Jul 2023 09:40:09 +0000 (11:40 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 13 Jul 2023 13:15:44 +0000 (15:15 +0200)
If brew install/update links openssl into /usr/local, it will be found
before anything we add with `-isystem path` to CPP/LDLFAGS.  Get rid of
that by unlinking the keg.

Fixes #11413
Closes #11436

.github/workflows/macos.yml

index 088852ac26a290ec1ee02c3befa451d9b80dda25..2b382dd95025b35e3255b32020b3d885489dd7d3 100644 (file)
@@ -119,6 +119,17 @@ jobs:
     - run: "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done"
       name: 'brew install'
 
+    - run: |
+        case "${{ matrix.build.install }}" in
+          *openssl*)
+            ;;
+          *)
+            if test -d /usr/local/include/openssl; then
+              brew unlink openssl
+            fi;;
+        esac
+      name: 'brew unlink openssl'
+
     - run: python3 -m pip install impacket
       name: 'pip3 install'
 
@@ -177,6 +188,17 @@ jobs:
     - run: "while [[ $? == 0 ]]; do for i in 1 2 3; do brew update && brew bundle install --no-lock --file /tmp/Brewfile && break 2 || { echo Error: wait to try again; sleep 10; } done; false Too many retries; done"
       name: 'brew install'
 
+    - run: |
+        case "${{ matrix.build.install }}" in
+          *openssl*)
+            ;;
+          *)
+            if test -d /usr/local/include/openssl; then
+              brew unlink openssl
+            fi;;
+        esac
+      name: 'brew unlink openssl'
+
     - uses: actions/checkout@v3
 
     - run: cmake -S. -Bbuild -DCURL_WERROR=ON -DPICKY_COMPILER=ON ${{ matrix.build.generate }}