Merge branch 'master' into pr

kabiroberai · Jul 22, 2023 · b5ecc08 · b5ecc08
2 parents 3d1678b + d29be9c
commit b5ecc08
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,8 +25,7 @@ jobs:
         os:
           - ubuntu-22.04
           - ubuntu-20.04
-          - ubuntu-18.04
-
+
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@main

diff --git a/prepare-toolchain b/prepare-toolchain
@@ -21,11 +21,16 @@ info "Creating prefix dir"
 rm -rf "${STAGING}"
 mkdir -p "${INSTALLPREFIX}"
 
-info "Building libtapi"
-cd "${ROOT}/apple-libtapi"
-./build.sh
-./install.sh
-make -C "${ROOT}/apple-libtapi/build" install-tapi -j "${JOBS}"
+info "Building LLVM tools"
+mkdir -p "${ROOT}/apple-libtapi/build"
+cd "${ROOT}/apple-libtapi/build"
+cmake ../src/llvm \
+	-DCMAKE_CXX_FLAGS="-I${PWD}/../src/llvm/projects/clang/include -I${PWD}/projects/clang/include" \
+	-DLLVM_INCLUDE_TESTS=OFF \
+	-DCMAKE_BUILD_TYPE=RELEASE \
+	-DCMAKE_INSTALL_PREFIX="${INSTALLPREFIX}"
+make clangBasic -j "${JOBS}"
+make libtapi dsymutil install-libtapi install-tapi-headers install-tapi install-dsymutil -j "${JOBS}"
 
 info "Building cctools"
 cd "${ROOT}/cctools-port/cctools"