Skip to content

Commit 5337dd2

Browse files
authored
Remove patch and build instructions
1 parent b9ea723 commit 5337dd2

File tree

4 files changed

+7
-475
lines changed

4 files changed

+7
-475
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ jobs:
15601560
else
15611561
CPLUS_INCLUDE_PATH="${LLVM_DIR}/llvm/include:${LLVM_DIR}/clang/include:${LLVM_BUILD_DIR}/include:${LLVM_BUILD_DIR}/tools/clang/include:$PWD/include"
15621562
fi
1563-
git apply -v ./patches/llvm/CppInterOp-temp-testing.patch
1563+
15641564
# Build CppInterOp next to cling and llvm-project.
15651565
mkdir build
15661566
cd build
@@ -1572,9 +1572,8 @@ jobs:
15721572
-DCMAKE_PREFIX_PATH=$PREFIX \
15731573
-DCling_DIR=$LLVM_BUILD_DIR/tools/cling \
15741574
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \
1575-
-DLLD_DIR=$LLVM_BUILD_DIR \
15761575
-DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/clang \
1577-
-DBUILD_SHARED_LIBS=ON \
1576+
-DBUILD_SHARED_LIBS=OFF \
15781577
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
15791578
-DCMAKE_INSTALL_PREFIX=$PREFIX \
15801579
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
@@ -1585,9 +1584,8 @@ jobs:
15851584
-DUSE_REPL=ON \
15861585
-DCMAKE_PREFIX_PATH=$PREFIX \
15871586
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \
1588-
-DLLD_DIR=$LLVM_BUILD_DIR \
15891587
-DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/clang \
1590-
-DBUILD_SHARED_LIBS=ON \
1588+
-DBUILD_SHARED_LIBS=OFF \
15911589
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
15921590
-DCMAKE_INSTALL_PREFIX=$PREFIX \
15931591
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
@@ -1625,4 +1623,4 @@ jobs:
16251623
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
16261624
-DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \
16271625
..
1628-
emmake make -j ${{ env.ncpus }}
1626+
EMCC_CFLAGS='-sERROR_ON_UNDEFINED_SYMBOLS=0' emmake make -j ${{ env.ncpus }}

.github/workflows/deploy-pages.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,9 @@ jobs:
123123
-DUSE_REPL=OFF \
124124
-DCMAKE_PREFIX_PATH=$PREFIX \
125125
-DCling_DIR=$LLVM_BUILD_DIR/tools/cling \
126-
-DLLD_DIR=$LLVM_BUILD_DIR \
127126
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \
128127
-DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/clang \
129-
-DBUILD_SHARED_LIBS=ON \
128+
-DBUILD_SHARED_LIBS=OFF \
130129
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
131130
-DCMAKE_INSTALL_PREFIX=$PREFIX \
132131
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
@@ -137,9 +136,8 @@ jobs:
137136
-DUSE_REPL=ON \
138137
-DCMAKE_PREFIX_PATH=$PREFIX \
139138
-DLLVM_DIR=$LLVM_BUILD_DIR/lib/cmake/llvm \
140-
-DLLD_DIR=$LLVM_BUILD_DIR \
141139
-DClang_DIR=$LLVM_BUILD_DIR/lib/cmake/clang \
142-
-DBUILD_SHARED_LIBS=ON \
140+
-DBUILD_SHARED_LIBS=OFF \
143141
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
144142
-DCMAKE_INSTALL_PREFIX=$PREFIX \
145143
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
@@ -177,7 +175,7 @@ jobs:
177175
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
178176
-DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \
179177
..
180-
emmake make -j ${{ env.ncpus }} install
178+
EMCC_CFLAGS='-sERROR_ON_UNDEFINED_SYMBOLS=0' emmake make -j ${{ env.ncpus }} install
181179
182180
- name: Jupyter Lite integration
183181
shell: bash -l {0}

Emscripten-build-instructions.md

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)