Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4f8ca442d731
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ef6f1aa9984
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 10, 2020

  1. 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.
    @matthewbauer
    matthewbauer committed Apr 10, 2020
    Copy the full SHA
    184cd9f View commit details

Commits on Apr 11, 2020

  1. Merge pull request #84933 from matthewbauer/fix-bazel-copts 

    build-bazel-package: fix linkopt flags
    @matthewbauer
    matthewbauer authored Apr 11, 2020
    Copy the full SHA
    9ef6f1a View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/build-support/build-bazel-package/default.nix
6 changes: 3 additions & 3 deletions pkgs/build-support/build-bazel-package/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 \