gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages.lldb: remove code for macOS < 11

Browse Source
This commit is contained in:
Emily
2024-10-05 19:45:28 +01:00
parent 98d5c93e0a
commit 4963ea1eaa
3 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/13/lldb/cpu_subtype_arm64e_replacement.patch
-12
View File
@@ -1,12 +0,0 @@
diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm
+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32,
len = sizeof(is_64_bit_capable);
::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0);
- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) {
+ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers
// The arm64e architecture is a preview. Pretend the host architecture
// is arm64.
cpusubtype = CPU_SUBTYPE_ARM64_ALL;
pkgs/development/compilers/llvm/common/default.nix
+1 -23
View File
@@ -264,12 +264,6 @@ let
path = ../12;
}
];
"lldb/cpu_subtype_arm64e_replacement.patch" = [
{
after = "13";
path = ../13;
}
];
"lldb/resource-dir.patch" = [
{
before = "16";
@@ -697,23 +691,7 @@ let
++ lib.optional (lib.versionOlder metadata.release_version "14") (
metadata.getVersionFile "lldb/gnu-install-dirs.patch"
)
++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch
# This is a stopgap solution if/until the macOS SDK used for x86_64 is
# updated.
#
# The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h`
# header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use
# of this preprocessor symbol in `lldb` with its expansion.
#
# See here for some context:
# https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132
#
# Patch is applied for >= 14 as the versions below are broken anyways.
++ lib.optional (
lib.versionAtLeast metadata.release_version "14"
&& stdenv.targetPlatform.isDarwin
&& lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
) (metadata.getVersionFile "lldb/cpu_subtype_arm64e_replacement.patch");
++ lib.optional (lib.versionAtLeast metadata.release_version "14") ./lldb/gnu-install-dirs.patch;
}
// lib.optionalAttrs (lib.versions.major metadata.release_version == "16") {
src = callPackage (
pkgs/development/compilers/llvm/common/lldb.nix
-10
View File
@@ -24,8 +24,6 @@
, patches ? [ ]
, enableManpages ? false
, devExtraCmakeFlags ? [ ]
, apple-sdk_11
, darwinMinVersionHook
, ...
}:
@@ -93,14 +91,6 @@ stdenv.mkDerivation (rec {
(lib.getLib libclang)
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.bootstrap_cmds
]
++ lib.optionals
(
stdenv.targetPlatform.isDarwin
&& lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0"
) [
apple-sdk_11
(darwinMinVersionHook "10.15")
];
hardeningDisable = [ "format" ];