ce789e7e35
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git. - remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required. - fixes https://github.com/NixOS/nixpkgs/issues/166205 - provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640 - pkgsCross.x86_64-freebsd builds work again This change can be represented in 3 stages 1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi} 2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin} 3. remove all references to libcxxabi outside of llvm (about 58 packages modified) ### merging libcxxabi into libcxx - take the union of the libcxxabi and libcxx cmake flags - eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency - libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx. - darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient. - linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient. - libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+) - git/libcxx/defaul.nix does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway. ### stdenv changes - darwin bootstrap, remove references to libcxxabi and cxxabi - cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12) - adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx ### 58 package updates - remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed - swift, nodejs_v8 remove libcxxabi references in the clang override https://github.com/NixOS/nixpkgs/pull/292043
31 lines
1.1 KiB
Nix
31 lines
1.1 KiB
Nix
{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }:
|
|
|
|
let
|
|
# Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors.
|
|
# Use an older version of clang with the current libc++ for compatibility (e.g., with icu).
|
|
ensureCompatibleCC = packages:
|
|
if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16"
|
|
then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override {
|
|
inherit (packages.llvmPackages) libcxx;
|
|
})
|
|
else packages.stdenv;
|
|
|
|
buildNodejs = callPackage ./nodejs.nix {
|
|
inherit openssl;
|
|
stdenv = ensureCompatibleCC pkgs;
|
|
buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; };
|
|
python = python3;
|
|
};
|
|
in
|
|
buildNodejs {
|
|
inherit enableNpm;
|
|
version = "18.19.1";
|
|
sha256 = "sha256-CQ+WouzeCAtrOCxtZCvKXQvkcCp4y1Vb578CsgvRbe0=";
|
|
patches = [
|
|
./disable-darwin-v8-system-instrumentation.patch
|
|
./bypass-darwin-xcrun-node16.patch
|
|
./revert-arm64-pointer-auth.patch
|
|
./node-npm-build-npm-package-logic.patch
|
|
./trap-handler-backport.patch
|
|
];
|
|
}
|