using LLVM_BUILT_WITH_OOP_JIT

Author: kr-2003

.github/actions/Build_and_Test_CppInterOp/action.yml

@@ -23,12 +23,6 @@ runs:
         export CPPINTEROP_DIR="$CB_PYTHON_DIR/cppyy_backend"
 
         # Build CppInterOp next to cling and llvm-project.
-        if [[ "${{ matrix.oop-jit }}" == "On" ]]; then
-          if [[ -f VERSION ]]; then
-            sed -i.bak 's/1\.8\.0;dev/1.8.1;dev/' VERSION
-            rm -f VERSION.bak
-          fi
-        fi
         mkdir build && cd build
         export CPPINTEROP_BUILD_DIR=$PWD
         cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
@@ -54,6 +48,7 @@ runs:
                 -DCODE_COVERAGE=${{ env.CODE_COVERAGE }}     \
                 -DCMAKE_INSTALL_PREFIX=$CPPINTEROP_DIR       \
                 -DLLVM_ENABLE_WERROR=On                      \
+                -DLLVM_BUILT_WITH_OOP_JIT=${{ matrix.oop-jit }} \
                 ../
         fi
         docs_on=$(echo "${{ matrix.documentation }}" | tr '[:lower:]' '[:upper:]')

CMakeLists.txt

@@ -395,16 +395,11 @@ string(REPLACE "-Wcovered-switch-default" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
 
 file(STRINGS "VERSION" CPPINTEROP_VERSION)
 string(REPLACE "." ";" VERSION_LIST "${CPPINTEROP_VERSION}")
-string(REPLACE "\;" ";" VERSION_LIST "${VERSION_LIST}")
 
 list(GET VERSION_LIST 0 CPPINTEROP_VERSION_MAJOR)
 list(GET VERSION_LIST 1 CPPINTEROP_VERSION_MINOR)
 list(GET VERSION_LIST 2 CPPINTEROP_VERSION_PATCH)
 
-if(NOT CPPINTEROP_VERSION_PATCH STREQUAL "0")
-  add_definitions(-DCPPINTEROP_VERSION_PATCH)
-endif()
-
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CppInterOp/CppInterOpConfig.cmake.in
   ${CMAKE_CURRENT_BINARY_DIR}/lib/cmake/CppInterOp/CppInterOpConfig.cmake

README.md

@@ -355,7 +355,7 @@ cmake --build . --target install --parallel $(nproc --all)
 
 and
 
-> Do make sure to apply the patch and change VERSION file to ``1.8.1;dev``, if you want to have out-of-process JIT execution feature enabled.
+> Do make sure to pass ``DLLVM_BUILT_WITH_OOP_JIT=ON``, if you want to have out-of-process JIT execution feature enabled.
 
 ```powershell
 cmake -DLLVM_DIR=$env:LLVM_DIR\build\lib\cmake\llvm -DClang_DIR=$env:LLVM_DIR\build\lib\cmake\clang -DCMAKE_INSTALL_PREFIX=$env:CPPINTEROP_DIR ..

docs/InstallationAndUsage.rst

@@ -321,7 +321,7 @@ commands on Linux and MacOS
 
 .. note::
 
-   Do make sure to apply the patch and change VERSION file to ``1.8.1;dev``, if you want to have out-of-process JIT execution feature enabled.
+   Do make sure to pass ``DLLVM_BUILT_WITH_OOP_JIT=ON``, if you want to have out-of-process JIT execution feature enabled.
 
 and
 

lib/CppInterOp/Compatibility.h

@@ -205,7 +205,7 @@ inline void codeComplete(std::vector<std::string>& Results,
 
 #include "llvm/Support/Error.h"
 
-#ifdef CPPINTEROP_VERSION_PATCH
+#ifdef LLVM_BUILT_WITH_OOP_JIT
 #include "clang/Basic/Version.h"
 #include "clang/Interpreter/RemoteJITUtils.h"
 #include "llvm/TargetParser/Host.h"
@@ -269,7 +269,7 @@ createClangInterpreter(std::vector<const char*>& args, int stdin_fd = 0,
   if (CudaEnabled)
     DeviceCI->LoadRequestedPlugins();
 
-#ifdef CPPINTEROP_VERSION_PATCH
+#ifdef LLVM_BUILT_WITH_OOP_JIT
   std::unique_ptr<llvm::orc::LLJITBuilder> JB;
 
   if (outOfProcess) {
@@ -439,7 +439,7 @@ inline void codeComplete(std::vector<std::string>& Results,
 #endif
 }
 
-#if defined(CPPINTEROP_VERSION_PATCH) && !defined(_WIN32)
+#if defined(LLVM_BUILT_WITH_OOP_JIT) && !defined(_WIN32)
 inline pid_t getExecutorPID() { return /*llvm*/ getLastLaunchedExecutorPID(); }
 
 inline pid_t getNthExecutorPID() { return /*llvm*/ getNthLaunchedExecutorPID(); }

lib/CppInterOp/CppInterOp.cpp

@@ -3991,7 +3991,7 @@ int Undo(unsigned N) {
 
 #ifndef _WIN32
 pid_t GetExecutorPID() {
-#ifdef CPPINTEROP_VERSION_PATCH
+#ifdef LLVM_BUILT_WITH_OOP_JIT
   return compat::getExecutorPID();
 #endif
   return -1;