From 184cd9f6ff4294881c51fa5958e7d093e3aa0a1b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 10 Apr 2020 15:41:39 -0400 Subject: [PATCH] build-bazel-package: fix linkopt flags These values were incorrect. We need to use NIX_LDFLAGS, not NIX_LD_FLAGS. Also need to prefix all flags with -Wl, for GCC to accept it. --- pkgs/build-support/build-bazel-package/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 47c72bf92602..9a64b84f076b 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -181,9 +181,9 @@ in stdenv.mkDerivation (fBuildAttrs // { done linkopts=() host_linkopts=() - for flag in $NIX_LD_FLAGS; do - linkopts+=( "--linkopt=$flag" ) - host_linkopts+=( "--host_linkopt=$flag" ) + for flag in $NIX_LDFLAGS; do + linkopts+=( "--linkopt=-Wl,$flag" ) + host_linkopts+=( "--host_linkopt=-Wl,$flag" ) done BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \