Merge master into staging-next

2020-02-12 09:55:31 +01:00
parent 1a6c3cb06b c6218f9e99
commit 424697d512
48 changed files with 383 additions and 215 deletions
@@ -11,6 +11,7 @@
    baseRustcOpts =
      [(if release then "-C opt-level=3" else "-C debuginfo=2")]
      ++ ["-C codegen-units=$NIX_BUILD_CORES"]
+      ++ ["--remap-path-prefix=$NIX_BUILD_TOP=/" ]
      ++ [(mkRustcDepArgs dependencies crateRenames)]
      ++ [crateFeatures]
      ++ extraRustcOpts