Skip to content

cling: cleanup, fix runtime error #302749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wegank merged 3 commits into from
Apr 9, 2024
Merged

cling: cleanup, fix runtime error #302749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c905fa
cling: cleanup
wegank Apr 9, 2024
18c40a3
cling: fix runtime error on aarch64-linux
wegank Apr 9, 2024
811a1b1
cling: fix runtime error on darwin
wegank Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions pkgs/development/interpreters/cling/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ cmake
, fetchFromGitHub
, fetchgit
, git
, lib
, libffi
Expand Down Expand Up @@ -28,7 +27,7 @@

# Build with libc++ (LLVM) rather than stdlibc++ (GCC).
# This is experimental and not all features work.
, useLLVMLibcxx ? false
, useLLVMLibcxx ? clangStdenv.isDarwin
}:

let
Expand All @@ -53,7 +52,7 @@ let
clingSrc = fetchFromGitHub {
owner = "root-project";
repo = "cling";
rev = "v1.0";
rev = "v${version}";
sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4=";
};

Expand All @@ -66,8 +65,6 @@ let

patches = [
./no-clang-cpp.patch

# ./force-install-cling-targets.patch
];

nativeBuildInputs = [ python3 git cmake ];
Expand Down Expand Up @@ -122,10 +119,10 @@ let
cxxFlags = if useLLVMLibcxx then [
"-I" "${lib.getDev llvmPackages_13.libcxx}/include/c++/v1"
"-L" "${llvmPackages_13.libcxx}/lib"
"-l" "${llvmPackages_13.libcxx}/lib/libc++.so"
"-l" "${llvmPackages_13.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}"
] else [
"-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}"
"-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/x86_64-unknown-linux-gnu"
"-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/${stdenv.hostPlatform.config}"
];

# The flags passed to the wrapped cling should
Expand Down
16 changes: 0 additions & 16 deletions pkgs/development/interpreters/cling/force-install-cling-targets.patch
View file
Open in desktop

This file was deleted.