diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-17 03:39:39 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-17 03:39:39 +0000 |
| commit | 49308ef0397a3da04ae1822188b1fedc70a33243 (patch) | |
| tree | 96bb06a039bcf472b1f3796bcb4b534df3f732ad /src/libstore/globals.hh | |
| parent | 74b251b2f3d6414de051c8523011c0ee3c5ea154 (diff) | |
| parent | 29542865cee37ab22efe1bd142900b69f6c59f0d (diff) | |
Merge remote-tracking branch 'upstream/master' into ca-drv
Diffstat (limited to 'src/libstore/globals.hh')
| -rw-r--r-- | src/libstore/globals.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index da95fd3ae..2fbcafff8 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -271,7 +271,7 @@ public: "listed in 'trusted-public-keys'."}; Setting<StringSet> extraPlatforms{this, - std::string{SYSTEM} == "x86_64-linux" ? StringSet{"i686-linux"} : StringSet{}, + std::string{SYSTEM} == "x86_64-linux" && !isWSL1() ? StringSet{"i686-linux"} : StringSet{}, "extra-platforms", "Additional platforms that can be built on the local system. " "These may be supported natively (e.g. armv7 on some aarch64 CPUs " |