From e2e400e26726b8b74c1685dbc2a282559d8ff77d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 29 Jan 2023 07:32:08 +0000 Subject: [PATCH] dmd: revert "set --sysroot=/ to avoid cc-wrapper value" This reverts commit 7c73d1e0258453b7ee08305e284197f8a7f7940c. commit 8c80bd08b7e39229947d55104d1871f5066437d9 ("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle from libc") was reverted. We can drop the workaround. --- pkgs/development/compilers/dmd/generic.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index c1fb9abf77d..3f8871df4f9 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -151,13 +151,6 @@ stdenv.mkDerivation rec { git ]; - # Workaround cc-wrapper's --sysroot= value for `staging-next`: it - # breaks library lookup via RUNPATH: - # ld: warning: libm.so.6, needed by ./generated/linux/release/64/lib.so, not found (try using -rpath or -rpath-link) - # ld: /build/druntime/generated/linux/release/64/libdruntime.so: undefined reference to `log10@GLIBC_2.2.5' - # TODO(trofi): remove the workaround once cc-wrapper is fixed. - NIX_CFLAGS_COMPILE = [ "--sysroot=/" ]; - buildInputs = [ curl tzdata