wip

minecraft-linux · Dec 4, 2024 · 6d4cf22 · 6d4cf22
1 parent f66d91e
commit 6d4cf22
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -86,7 +86,7 @@ jobs:
         git clone https://github.com/llvm/llvm-project.git llvm -b release/10.x
         mkdir -p libcxx32-build
         cd libcxx32-build
-        cmake ../llvm/llvm -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON
+        cmake ../llvm/llvm -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release -DLIBCXX_BUILD_32_BITS=ON -DLIBCXXABI_BUILD_32_BITS=ON -DLLVM_BUILD_32_BITS=ON
         make -j8 cxx cxxabi
   build-libcxx64:
     runs-on: macos-13
@@ -120,7 +120,7 @@ jobs:
         git clone https://github.com/llvm/llvm-project.git llvm -b release/10.x
         mkdir -p libcxx64-build
         cd libcxx64-build
-        cmake ../llvm/llvm -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release
+        cmake ../llvm/llvm -DHAVE_CXX_ATOMICS_WITHOUT_LIB=ON -DHAVE_CXX_ATOMICS64_WITHOUT_LIB=ON -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DCMAKE_BUILD_TYPE=Release
         make -j8 cxx cxxabi
   build-libcxx:
     runs-on: macos-13
@@ -362,6 +362,9 @@ jobs:
       if: steps.angle.outputs.cache-hit != 'true'
   build-protobuf:
     runs-on: macos-13
+    env:
+      CC: clang
+      CXX: clang++
     steps:
     - uses: actions/cache/restore@v3
       id: cache