Revert "glib: use LLD on Darwin to work around ld64 hardening issue"
The ld64 issue has been fixed.
This reverts commit 5f08853644.
This commit is contained in:
@@ -24,8 +24,6 @@
|
||||
gi-docgen,
|
||||
# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib)
|
||||
util-linuxMinimal ? null,
|
||||
# TODO: Clean up on `staging`.
|
||||
llvmPackages,
|
||||
buildPackages,
|
||||
|
||||
# this is just for tests (not in the closure of any regular package)
|
||||
@@ -209,10 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals withDtrace [
|
||||
systemtap' # for dtrace
|
||||
]
|
||||
# TODO: Clean up on `staging`.
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
llvmPackages.lld
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -256,13 +250,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DG_DISABLE_CAST_CHECKS"
|
||||
];
|
||||
DETERMINISTIC_BUILD = 1;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# Work around ld64 hardening issue.
|
||||
#
|
||||
# TODO: Clean up on `staging`.
|
||||
CC_LD = "lld";
|
||||
OBJC_LD = "lld";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user