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: aa0cf6442270
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 38a89c865374
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. gcc: fix gcc8 for cross-compiled targets 

    Adds EXTRA_TARGET_FLAGS missing from 4120939.

Fixes #58164
    @arcnmx
    arcnmx committed Mar 26, 2019
    Copy the full SHA
    05b0411 View commit details

  2. Merge pull request #58313 from arcnmx/gcc-8-cross 

    gcc: fix gcc8 for cross-compiled targets
    @matthewbauer
    matthewbauer authored Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    38a89c8 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/development/compilers/gcc/8/default.nix
7 changes: 7 additions & 0 deletions pkgs/development/compilers/gcc/8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -322,6 +322,13 @@ stdenv.mkDerivation ({

LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib));

EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
([
"-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}"
] ++ optionals (! crossStageStatic) [
"-B${libcCross.out}${libcCross.libdir or "/lib"}"
]);

EXTRA_TARGET_LDFLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)