From f6bc65ed5bef9ee2978fb755b7abd2c882c3573c Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Thu, 20 Jul 2023 02:52:42 -0700 Subject: [PATCH 1/3] cling: tidy/simplify + add experimental libc++ support --- .../interpreters/cling/default.nix | 102 +++++++++++------- 1 file changed, 66 insertions(+), 36 deletions(-) diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 6a2fa5ea50dae..e210d5d513579 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -1,22 +1,38 @@ -{ lib -, stdenv -, python3 -, libffi -, git -, cmake -, zlib -, fetchgit +{ cmake , fetchFromGitHub -, makeWrapper -, runCommand +, fetchgit +, git +, lib +, libffi , llvmPackages_9 -, glibc +, makeWrapper , ncurses +, python3 +, runCommandNoCC +, zlib + +# *NOT* from LLVM 9! +# It would be cleanest to use LLVM 9's clang to build this, but it errors. +# So we use a later version of Clang to compile, but we check out the Cling +# fork of Clang 9 to build Cling against, as it expects. +, clangStdenv + +# For runtime C++ standard library +, gcc-unwrapped + +# Build with debug symbols +, debug ? false + +# Build with libc++ (LLVM) rather than stdlibc++ (GCC). +# This is experimental and not all features work. +, useLLVMLibcxx ? false }: let + stdenv = clangStdenv; + # The LLVM 9 headers have a couple bugs we need to patch - fixedLlvmDev = runCommand "llvm-dev-${llvmPackages_9.llvm.version}" { buildInputs = [git]; } '' + fixedLlvmDev = runCommandNoCC "llvm-dev-${llvmPackages_9.llvm.version}" { buildInputs = [git]; } '' mkdir $out cp -r ${llvmPackages_9.llvm.dev}/include $out cd $out @@ -58,7 +74,7 @@ let ]; nativeBuildInputs = [ python3 git cmake ]; - buildInputs = [ libffi zlib ncurses ]; + buildInputs = [ libffi ncurses zlib ]; strictDeps = true; @@ -69,6 +85,7 @@ let "-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_BUILD_TOOLS=Off" "-DLLVM_TOOL_CLING_BUILD=ON" "-DLLVM_TARGETS_TO_BUILD=host;NVPTX" @@ -78,14 +95,22 @@ let # see cling/tools/CMakeLists.txt "-DCLING_INCLUDE_TESTS=ON" "-DCLANG-TOOLS=OFF" - # "--trace-expand" + ] ++ lib.optionals debug [ + "-DCMAKE_BUILD_TYPE=Debug" + ] ++ lib.optionals useLLVMLibcxx [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLLVM_ENABLE_LIBCXXABI=ON" ]; + CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else []; + postInstall = lib.optionalString (!stdenv.isDarwin) '' mkdir -p $out/share/Jupyter cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter ''; + dontStrip = debug; + meta = with lib; { description = "The Interactive C++ Interpreter"; homepage = "https://root.cern/cling/"; @@ -95,44 +120,49 @@ let }; }; + # Runtime flags for the C++ standard library + cxxFlags = if useLLVMLibcxx then [ + "-I" "${lib.getDev llvmPackages_9.libcxx}/include/c++/v1" + "-L" "${llvmPackages_9.libcxx}/lib" + "-l" "${llvmPackages_9.libcxx}/lib/libc++.so" + ] else [ + "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}" + "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/x86_64-unknown-linux-gnu" + ]; + # The flags passed to the wrapped cling should # a) prevent it from searching for system include files and libs, and - # b) provide it with the include files and libs it needs (C and C++ standard library) + # b) provide it with the include files and libs it needs (C and C++ standard library plus + # its own stuff) - # These are also exposed as cling.flags/cling.compilerIncludeFlags because it's handy to be - # able to pass them to tools that wrap Cling, particularly Jupyter kernels such as xeus-cling - # and the built-in jupyter-cling-kernel. Both of these use Cling as a library by linking against - # libclingJupyter.so, so the makeWrapper approach to wrapping the binary doesn't work. + # These are also exposed as cling.flags because it's handy to be able to pass them to tools + # that wrap Cling, particularly Jupyter kernels such as xeus-cling and the built-in + # jupyter-cling-kernel, which use Cling as a library. # Thus, if you're packaging a Jupyter kernel, you either need to pass these flags as extra # args to xcpp (for xeus-cling) or put them in the environment variable CLING_OPTS - # (for jupyter-cling-kernel) + # (for jupyter-cling-kernel). flags = [ "-nostdinc" "-nostdinc++" + + "-isystem" "${lib.getLib unwrapped}/lib/clang/9.0.1/include" + ] + ++ cxxFlags + ++ [ + # System libc "-isystem" "${lib.getDev stdenv.cc.libc}/include" - "-I" "${lib.getDev unwrapped}/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 - # https://github.com/root-project/cling/blob/v0.7/lib/Interpreter/CIFactory.cpp#L107:L111 - # Note: it would be nice to just put the compiler in Cling's PATH and let it do this by itself, but - # unfortunately passing -nostdinc/-nostdinc++ disables Cling's autodetection logic. - compilerIncludeFlags = runCommand "compiler-include-flags.txt" {} '' - export LC_ALL=C - ${stdenv.cc}/bin/c++ -xc++ -E -v /dev/null 2>&1 | sed -n -e '/^.include/,''${' -e '/^ \/.*++/p' -e '}' > tmp - sed -e 's/^/-isystem /' -i tmp - tr '\n' ' ' < tmp > $out - ''; + # cling includes + "-isystem" "${lib.getDev unwrapped}/include" + ]; in -runCommand "cling-${unwrapped.version}" { +runCommandNoCC "cling-${unwrapped.version}" { nativeBuildInputs = [ makeWrapper ]; - inherit unwrapped flags compilerIncludeFlags; + inherit unwrapped flags; inherit (unwrapped) meta; } '' makeWrapper $unwrapped/bin/cling $out/bin/cling \ - --add-flags "$(cat "$compilerIncludeFlags")" \ --add-flags "$flags" '' From 73d4d837254f151564f995bfc744bf35a434a49d Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 18 Aug 2023 06:19:24 -0700 Subject: [PATCH 2/3] Add additional comments about why we use Clang --- pkgs/development/interpreters/cling/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index e210d5d513579..4ffeb12b00ff3 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -12,9 +12,12 @@ , zlib # *NOT* from LLVM 9! -# It would be cleanest to use LLVM 9's clang to build this, but it errors. -# So we use a later version of Clang to compile, but we check out the Cling -# fork of Clang 9 to build Cling against, as it expects. +# The compiler used to compile Cling may affect the runtime include and lib +# directories it expects to be run with. Cling builds against (a fork of) Clang, +# so we prefer to use Clang as the compiler as well for consistency. +# It would be cleanest to use LLVM 9's clang, but it errors. So, we use a later +# version of Clang to compile, but we check out the Cling fork of Clang 9 to +# build Cling against. , clangStdenv # For runtime C++ standard library From a2905d0caebceeda7d6ba8f14d3113487cdf1537 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Fri, 18 Aug 2023 06:21:27 -0700 Subject: [PATCH 3/3] runCommandNoCC -> runCommand --- pkgs/development/interpreters/cling/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 4ffeb12b00ff3..f59c1910a6ff6 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -8,7 +8,7 @@ , makeWrapper , ncurses , python3 -, runCommandNoCC +, runCommand , zlib # *NOT* from LLVM 9! @@ -35,7 +35,7 @@ let stdenv = clangStdenv; # The LLVM 9 headers have a couple bugs we need to patch - fixedLlvmDev = runCommandNoCC "llvm-dev-${llvmPackages_9.llvm.version}" { buildInputs = [git]; } '' + fixedLlvmDev = runCommand "llvm-dev-${llvmPackages_9.llvm.version}" { buildInputs = [git]; } '' mkdir $out cp -r ${llvmPackages_9.llvm.dev}/include $out cd $out @@ -161,7 +161,7 @@ let in -runCommandNoCC "cling-${unwrapped.version}" { +runCommand "cling-${unwrapped.version}" { nativeBuildInputs = [ makeWrapper ]; inherit unwrapped flags; inherit (unwrapped) meta;