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

Commits on May 11, 2020

  1. gcc10: fix eval due to missing langJit 

    The libgccjit PR was merged after the one introducing gcc10, thus
staging fails to eval because of the missing `langJit` argument.
    @cole-h
    cole-h committed May 11, 2020
    Copy the full SHA
    f7a9303 View commit details

Commits on May 12, 2020

  1. Merge pull request #87637 from cole-h/gcc10 

    gcc10: fix eval due to missing `langJit`
    @matthewbauer
    matthewbauer authored May 12, 2020
    Copy the full SHA
    c890724 View commit details
Showing with 5 additions and 3 deletions.
  1. +5 −3 pkgs/development/compilers/gcc/10/default.nix
8 changes: 5 additions & 3 deletions pkgs/development/compilers/gcc/10/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
, langObjCpp ? stdenv.targetPlatform.isDarwin
, langGo ? false
, profiledCompiler ? false
, langJit ? false
, staticCompiler ? false
, enableShared ? true
, enableLTO ? true
@@ -85,7 +86,7 @@ stdenv.mkDerivation ({

inherit patches;

outputs = [ "out" "lib" "man" "info" ];
outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
setOutputFlags = false;
NIX_NO_SELF_RPATH = true;

@@ -100,10 +101,10 @@ stdenv.mkDerivation ({
--replace 'if (stdinc)' 'if (0)'
substituteInPlace libgcc/config/t-slibgcc-darwin \
--replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
--replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)"
substituteInPlace libgfortran/configure \
--replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
--replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname"
'';

postPatch = ''
@@ -202,6 +203,7 @@ stdenv.mkDerivation ({
langGo
langObjC
langObjCpp
langJit
;
};