diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-27 18:01:22 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-27 21:56:47 +0200 |
commit | f82a1d12eb60abd555c0a8a0fbd407411bb0eca3 (patch) | |
tree | 4872515b7e67fdfd5692202dd69befdb3109b13c /pkgs/build-support/setup-hooks | |
parent | d863884130768be524f00df15b755b6c25808237 (diff) |
Revert "make-binary-wrapper: add cc to propagatedBuildInputs"
This reverts commit 0c34636a5690cf8d75ecbab62d41179c56571f79. Seems to be causing some weird side effects. pkgsMusl.systemd no longer builds: Command line: `clang /run/user/1008/tmp.WuVNjgdfHT/source/build/meson-private/tmpdd3qc57v/testfile.c -o /run/user/1008/tmp.WuVNjgdfHT/source/build/meson-private/tmpdd3qc57v/output.obj -c -D_FILE_OFFSET_BITS=64 -O0 -Werror=implicit-function-declaration -Werror=unknown-warning-option -Werror=unused-command-line-argument -Werror=ignored-optimization-argument -std=gnu11` -> 1 stderr: clang: error: argument unused during compilation: '-pie' [-Werror,-Wunused-command-line-argument]
Diffstat (limited to 'pkgs/build-support/setup-hooks')
-rw-r--r-- | pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index 28ad330278539..f364dd5de753d 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -10,7 +10,7 @@ makeSetupHook { name = "make-binary-wrapper-hook"; - propagatedBuildInputs = [ dieHook cc ]; + propagatedBuildInputs = [ dieHook ]; substitutions = { cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}"; |