Skip to content
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.

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

llvmPackages_9: remove due to age #302750

Merged
merged 1 commit into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, cling
, fetchurl
, lib
, llvmPackages_9
, llvmPackages_13
, makeWrapper
, runCommand
, stdenv
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
, fetchFromGitHub
, gcc
, git
, llvmPackages_9
, llvmPackages_13
# Libraries
, argparse
, cling
Expand Down Expand Up @@ -60,7 +60,7 @@ clangStdenv.mkDerivation rec {
cling.unwrapped
cppzmq
libuuid
llvmPackages_9.llvm
llvmPackages_13.llvm
ncurses
openssl
pugixml
Expand All @@ -75,6 +75,15 @@ clangStdenv.mkDerivation rec {
"-DCMAKE_BUILD_TYPE=Debug"
];

postPatch = ''
substituteInPlace src/xmagics/executable.cpp \
--replace "getDataLayout" "getDataLayoutString"
substituteInPlace src/xmagics/execution.cpp \
--replace "simplisticCastAs" "castAs"
substituteInPlace src/xmime_internal.hpp \
--replace "code.str()" "code.str().str()"
'';

dontStrip = debug;

meta = {
Expand Down
5 changes: 0 additions & 5 deletions pkgs/build-support/cc-wrapper/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -562,11 +562,6 @@ stdenv.mkDerivation {
echo "-isystem ${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
''
# can remove once LLVM9 and LLVM11 are dropped from nixpkgs
+ optionalString (libcxx.isLLVM or false && lib.versionOlder (lib.getVersion libcxx) "12" && libcxx ? cxxabi.libName) ''
echo "-isystem ${lib.getDev libcxx.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags
''

##
## Initial CFLAGS
Expand Down
80 changes: 0 additions & 80 deletions pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch

This file was deleted.

This file was deleted.

140 changes: 0 additions & 140 deletions pkgs/development/compilers/llvm/9/clang/default.nix

This file was deleted.

Loading