Merge staging-next into staging
This commit is contained in:
@@ -7,7 +7,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
@@ -137,10 +142,10 @@ stdenv.mkDerivation ({
|
||||
)
|
||||
else "")
|
||||
+ stdenv.lib.optionalString targetPlatform.isAvr ''
|
||||
makeFlagsArray+=(
|
||||
'LIMITS_H_TEST=false'
|
||||
)
|
||||
'';
|
||||
makeFlagsArray+=(
|
||||
'LIMITS_H_TEST=false'
|
||||
)
|
||||
'';
|
||||
|
||||
inherit noSysDirs staticCompiler crossStageStatic
|
||||
libcCross crossMingw;
|
||||
|
||||
@@ -7,7 +7,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man); required for Java
|
||||
|
||||
@@ -7,7 +7,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man); required for Java
|
||||
|
||||
@@ -8,7 +8,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, flex
|
||||
|
||||
@@ -6,7 +6,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
|
||||
@@ -6,7 +6,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
@@ -134,10 +139,10 @@ stdenv.mkDerivation ({
|
||||
)
|
||||
else "")
|
||||
+ stdenv.lib.optionalString targetPlatform.isAvr ''
|
||||
makeFlagsArray+=(
|
||||
'LIMITS_H_TEST=false'
|
||||
)
|
||||
'';
|
||||
makeFlagsArray+=(
|
||||
'LIMITS_H_TEST=false'
|
||||
)
|
||||
'';
|
||||
|
||||
inherit noSysDirs staticCompiler crossStageStatic
|
||||
libcCross crossMingw;
|
||||
|
||||
@@ -8,7 +8,12 @@
|
||||
, profiledCompiler ? false
|
||||
, langJit ? false
|
||||
, staticCompiler ? false
|
||||
, enableShared ? true
|
||||
, # N.B. the defult is intentionally not from an `isStatic`. See
|
||||
# https://gcc.gnu.org/install/configure.html - this is about target
|
||||
# platform libraries not host platform ones unlike normal. But since
|
||||
# we can't rebuild those without also rebuilding the compiler itself,
|
||||
# we opt to always build everything unlike our usual policy.
|
||||
enableShared ? true
|
||||
, enableLTO ? true
|
||||
, texinfo ? null
|
||||
, perl ? null # optional, for texi2pod (then pod2man)
|
||||
|
||||
@@ -35,8 +35,8 @@ let
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "go";
|
||||
version = "2";
|
||||
pname = "go2-unstable";
|
||||
version = "2020-12-08";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://go.googlesource.com/go;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++abi";
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
|
||||
{ stdenv, version, fetch, cmake, fetchpatch
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunwind";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++abi";
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
|
||||
{ stdenv, version, fetch, cmake, fetchpatch
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunwind";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
|
||||
, enableShared ? ! stdenv.hostPlatform.isMusl }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++";
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
{ stdenv, cmake, fetch, libcxx, llvm, version
|
||||
, standalone ? false
|
||||
# on musl the shared objects don't build
|
||||
, enableShared ? ! stdenv.hostPlatform.isMusl }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++abi";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++abi";
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
|
||||
{ stdenv, version, fetch, cmake, fetchpatch
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libunwind";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version
|
||||
, enableShared ? true }:
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libc++abi";
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }:
|
||||
{ stdenv, version, fetch, cmake, fetchpatch
|
||||
, enableShared ? !stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libunwind";
|
||||
|
||||
Reference in New Issue
Block a user