From 8c542f42bc9084b357738a2bc75a8bffa87d0ed3 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 21 Dec 2020 14:55:18 +0100
Subject: [PATCH] ci: clang: always use libc++

---
 .github/workflows/cmake-build-ci.gen | 19 ++++++++++++++++++-
 .github/workflows/cmake-build-ci.yml |  5 +++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index e4bc6785..0376fd3a 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -39,13 +39,30 @@ const ENV = [
         "INSTALL_CC" => "gcc-10",
         "INSTALL_CXX" => "g++-10",
       ]
+    ],
+    "clang" => [
+      "new" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
+      "cur" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
+      "old" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
     ]
   ],
   "ubuntu-18.04" => [
     "clang" => [
+      "new" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
+      "cur" => [
+        "CXXFLAGS" => "-stdlib=libc++"
+      ],
       "old" => [
         "CXXFLAGS" => "-stdlib=libc++"
-      ]
+      ],
     ]
   ]
 ];
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 5b2c8e8a..b8548a6d 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -439,16 +439,19 @@ jobs:
         run: |
           echo CC="clang-10" >> ${GITHUB_ENV}
           echo CXX="clang++-10" >> ${GITHUB_ENV}
+          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
         run: |
           echo CC="clang-9" >> ${GITHUB_ENV}
           echo CXX="clang++-9" >> ${GITHUB_ENV}
+          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
         run: |
           echo CC="clang-8" >> ${GITHUB_ENV}
           echo CXX="clang++-8" >> ${GITHUB_ENV}
+          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for new gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
         run: |
@@ -469,11 +472,13 @@ jobs:
         run: |
           echo CC="clang-9" >> ${GITHUB_ENV}
           echo CXX="clang++-9" >> ${GITHUB_ENV}
+          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
         run: |
           echo CC="clang-8" >> ${GITHUB_ENV}
           echo CXX="clang++-8" >> ${GITHUB_ENV}
+          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
         run: |
-- 
2.30.2