diff options
| author | Tom McLaughlin <tom@codedown.io> | 2022-11-22 16:21:55 -0800 |
|---|---|---|
| committer | Tom McLaughlin <tom@codedown.io> | 2023-04-04 16:38:48 -0700 |
| commit | d7b1cb48aa8d150f9954a9cce99e95a799b8fd4c (patch) | |
| tree | 214e3f451e625f516429e38f4eb7506a03f0e16f /pkgs/development/interpreters/cling | |
| parent | d395cc96341901d8be4c3d5a3627e44536198a4f (diff) | |
More on cling patch
Diffstat (limited to 'pkgs/development/interpreters/cling')
| -rw-r--r-- | pkgs/development/interpreters/cling/use-patched-llvm.patch | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/development/interpreters/cling/use-patched-llvm.patch b/pkgs/development/interpreters/cling/use-patched-llvm.patch index 34c3bdb438760..dc2ee15369974 100644 --- a/pkgs/development/interpreters/cling/use-patched-llvm.patch +++ b/pkgs/development/interpreters/cling/use-patched-llvm.patch @@ -2,33 +2,31 @@ diff --git a/tools/cling/lib/Interpreter/CMakeLists.txt b/tools/cling/lib/Interp index 75396717..6a617ab4 100644 --- a/tools/cling/lib/Interpreter/CMakeLists.txt +++ b/tools/cling/lib/Interpreter/CMakeLists.txt -@@ -344,3 +344,29 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h +@@ -344,3 +344,25 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/CIFactory.cpp ${CMAKE_CURRENT_BINARY_DIR}/cling-compiledata.h) + +# If LLVM is external, but Clang is builtin, we must use some files +# from patched (builtin) version of LLVM -+if ((NOT builtin_llvm) AND builtin_clang) -+ set(FixInclude "${CMAKE_SOURCE_DIR}/interpreter/llvm/include") ++set(FixInclude "${CMAKE_SOURCE_DIR}/interpreter/llvm/include") + -+ get_property(P SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES) -+ list(INSERT P 0 ${FixInclude}) -+ set_property(SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") ++get_property(P SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES) ++list(INSERT P 0 ${FixInclude}) ++set_property(SOURCE IncrementalJIT.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") + -+ get_property(P SOURCE IncrementalExecutor.cpp PROPERTY INCLUDE_DIRECTORIES) -+ list(INSERT P 0 ${FixInclude}) -+ set_property(SOURCE IncrementalExecutor.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") ++get_property(P SOURCE IncrementalExecutor.cpp PROPERTY INCLUDE_DIRECTORIES) ++list(INSERT P 0 ${FixInclude}) ++set_property(SOURCE IncrementalExecutor.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") + -+ get_property(P SOURCE Interpreter.cpp PROPERTY INCLUDE_DIRECTORIES) -+ list(INSERT P 0 ${FixInclude}) -+ set_property(SOURCE Interpreter.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") ++get_property(P SOURCE Interpreter.cpp PROPERTY INCLUDE_DIRECTORIES) ++list(INSERT P 0 ${FixInclude}) ++set_property(SOURCE Interpreter.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") + -+ get_property(P SOURCE Transaction.cpp PROPERTY INCLUDE_DIRECTORIES) -+ list(INSERT P 0 ${FixInclude}) -+ set_property(SOURCE Transaction.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") ++get_property(P SOURCE Transaction.cpp PROPERTY INCLUDE_DIRECTORIES) ++list(INSERT P 0 ${FixInclude}) ++set_property(SOURCE Transaction.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") + -+ get_property(P SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES) -+ list(INSERT P 0 ${FixInclude}) -+ set_property(SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES "${P}") ++get_property(P SOURCE TransactionUnloader.cpp PROPERTY INCLUDE_DIRECTORIES) ++list(INSERT P 0 ${FixInclude}) +endif() |