diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/gcc/common')
3 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 12d3f5d8987e..3f1866713e60 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , targetPackages , crossStageStatic, libcCross @@ -24,8 +24,8 @@ , langJit }: -assert cloog != null -> stdenv.lib.versionOlder version "5"; -assert langJava -> stdenv.lib.versionOlder version "7"; +assert cloog != null -> lib.versionOlder version "5"; +assert langJava -> lib.versionOlder version "7"; # Note [Windows Exception Handling] # sjlj (short jump long jump) exception handling makes no sense on x86_64, @@ -171,7 +171,7 @@ let ++ lib.optional javaAwtGtk "--enable-java-awt=gtk" ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" - ++ (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) + ++ (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix index 0a5a7a1bc1cb..6ced56cedc05 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -11,7 +11,7 @@ in EXTRA_FLAGS_FOR_TARGET = let mkFlags = dep: langD: lib.optionals (targetPlatform != hostPlatform && dep != null && !langD) ([ "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}" - ] ++ stdenv.lib.optionals (! crossStageStatic) [ + ] ++ lib.optionals (! crossStageStatic) [ "-B${lib.getLib dep}${dep.libdir or "/lib"}" ]); in mkFlags libcCross langD diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix index f3cdce411939..66af8c4a4cc7 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -1,7 +1,7 @@ { lib, targetPlatform }: let - p = targetPlatform.platform.gcc or {} + p = targetPlatform.gcc or {} // targetPlatform.parsed.abi; in lib.concatLists [ (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64 |