diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-17 18:34:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-08-17 18:34:17 +0200 |
| commit | 8f2ea38f8fda5876cfaf963097b9fe709159f3ff (patch) | |
| tree | 5b5e304fec50ede4c46c475c9ed1d0414e54ab6b /pkgs/stdenv/linux | |
| parent | 9289365627ce6b82d9ec2f3029e82aa8fc93e655 (diff) | |
| parent | 31eea73f994b8cca50d3f88d6a4fadd98e09e798 (diff) | |
| download | nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.gz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.bz2 nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.lz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.xz nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.tar.zst nixlib-8f2ea38f8fda5876cfaf963097b9fe709159f3ff.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 2ce73eb781d8..c8cddf248ab9 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -21,8 +21,8 @@ rec { enableMinimal = true; extraConfig = '' CONFIG_ASH y - CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_TEST y + CONFIG_ASH_ECHO y + CONFIG_ASH_TEST y CONFIG_ASH_OPTIMIZE_FOR_SIZE y CONFIG_MKDIR y CONFIG_TAR y |