about summary refs log tree commit diff
path: root/pkgs/development/interpreters/cling
diff options
context:
space:
mode:
authorTom McLaughlin <tom@codedown.io>2023-04-15 02:48:16 -0700
committerTom McLaughlin <tom@codedown.io>2023-04-15 02:48:16 -0700
commitfddb69ff3d910a61e091ea8681e509228a29825d (patch)
tree783caafe9095f6dead57ebe324a9bf7014a20005 /pkgs/development/interpreters/cling
parentd77f11a719f78a8ab6dd000a640c5cad79d189a5 (diff)
Remove notes and fix clang include in flags
Diffstat (limited to 'pkgs/development/interpreters/cling')
-rw-r--r--pkgs/development/interpreters/cling/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix
index 5ef6614af2a93..3e394daf5fd81 100644
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@@ -58,12 +58,12 @@ let
     strictDeps = true;
 
     cmakeFlags = [
-      "-DLLVM_BINARY_DIR=${llvmPackages_9.llvm.out}" # llvm_dir
-      "-DLLVM_CONFIG=${llvmPackages_9.llvm.dev}/bin/llvm-config" # llvm_config_path
-      "-DLLVM_LIBRARY_DIR=${llvmPackages_9.llvm.lib}/lib" # os.path.join(llvm_dir, 'lib')
-      "-DLLVM_MAIN_INCLUDE_DIR=${fixedLlvmDev}/include" # os.path.join(llvm_dir, 'include')
-      "-DLLVM_TABLEGEN_EXE=${llvmPackages_9.llvm.out}/bin/llvm-tblgen" # os.path.join(llvm_dir, 'bin', 'llvm-tblgen')
-      "-DLLVM_TOOLS_BINARY_DIR=${llvmPackages_9.llvm.out}/bin" # os.path.join(llvm_dir, 'bin')
+      "-DLLVM_BINARY_DIR=${llvmPackages_9.llvm.out}"
+      "-DLLVM_CONFIG=${llvmPackages_9.llvm.dev}/bin/llvm-config"
+      "-DLLVM_LIBRARY_DIR=${llvmPackages_9.llvm.lib}/lib"
+      "-DLLVM_MAIN_INCLUDE_DIR=${fixedLlvmDev}/include"
+      "-DLLVM_TABLEGEN_EXE=${llvmPackages_9.llvm.out}/bin/llvm-tblgen"
+      "-DLLVM_TOOLS_BINARY_DIR=${llvmPackages_9.llvm.out}/bin"
       "-DLLVM_TOOL_CLING_BUILD=ON"
 
       "-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
@@ -101,7 +101,7 @@ let
     "-nostdinc++"
     "-isystem" "${lib.getDev stdenv.cc.libc}/include"
     "-I" "${lib.getDev unwrapped}/include"
-    # "-I" "${lib.getLib unwrapped}/lib/clang/5.0.2/include"
+    "-I" "${lib.getLib unwrapped}/lib/clang/9.0.1/include"
   ];
 
   # Autodetect the include paths for the compiler used to build Cling, in the same way Cling does at