Skip to content

Commit 377035f

Browse files
committed
Add compat path to kernels
1 parent 5bd1bf3 commit 377035f

File tree

7 files changed

+6
-5
lines changed

7 files changed

+6
-5
lines changed

share/jupyter/kernels/xc11/wasm_kernel.json.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"argv": [
44
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
55
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
6+
"-Xclang", "-iwithsysroot/include/compat",
67
"-xc",
78
"-std=c11",
89
"-mllvm", "-enable-emscripten-sjlj",

share/jupyter/kernels/xc17/wasm_kernel.json.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"argv": [
44
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
55
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
6+
"-Xclang", "-iwithsysroot/include/compat",
67
"-xc",
78
"-std=c17",
89
"-mllvm", "-enable-emscripten-sjlj",

share/jupyter/kernels/xc23/wasm_kernel.json.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"argv": [
44
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
55
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
6+
"-Xclang", "-iwithsysroot/include/compat",
67
"-xc",
78
"-std=c23",
89
"-mllvm", "-enable-emscripten-sjlj",

share/jupyter/kernels/xcpp17/wasm_kernel.json.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"argv": [
44
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
55
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
6+
"-Xclang", "-iwithsysroot/include/compat",
67
"-std=c++17", "-mllvm", "-enable-emscripten-cxx-exceptions",
78
"-mllvm", "-enable-emscripten-sjlj", "-msimd128"
89
],

share/jupyter/kernels/xcpp20/wasm_kernel.json.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"argv": [
44
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
55
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
6+
"-Xclang", "-iwithsysroot/include/compat",
67
"-std=c++20", "-mllvm", "-enable-emscripten-cxx-exceptions",
78
"-mllvm", "-enable-emscripten-sjlj", "-msimd128"
89
],

share/jupyter/kernels/xcpp23/wasm_kernel.json.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"argv": [
44
"@XEUS_CPP_KERNELSPEC_PATH@xcpp",
55
"-resource-dir", "/lib/clang/@CPPINTEROP_LLVM_VERSION_MAJOR@",
6+
"-Xclang", "-iwithsysroot/include/compat",
67
"-std=c++23", "-mllvm", "-enable-emscripten-cxx-exceptions",
78
"-mllvm", "-enable-emscripten-sjlj", "-msimd128"
89
],

src/xinterpreter.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ void* createInterpreter(const Args &ExtraArgs = {}) {
4646
ClangArgs.push_back(CxxInclude.c_str());
4747
}
4848

49-
#ifdef __EMSCRIPTEN__
50-
ClangArgs.push_back("-Xclang");
51-
ClangArgs.push_back("-iwithsysroot/include/compat");
52-
#endif
53-
5449
ClangArgs.insert(ClangArgs.end(), ExtraArgs.begin(), ExtraArgs.end());
5550
// FIXME: We should process the kernel input options and conditionally pass
5651
// the gpu args here.

0 commit comments

Comments
 (0)