Merge pull request #177 from holochain/rsm_release

Rsm release
holochain · Sep 10, 2020 · 4c4d4bd · 4c4d4bd
2 parents ec78359 + dbf3778
commit 4c4d4bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/rust/config.nix b/rust/config.nix
@@ -73,10 +73,7 @@ let
       # 3 = aggressive
       # s = size
       # z = size min
-      optimization-level = "z";
-
-      debug-level = "2";
-
+      #optimization-level = "z";
     };
 
   };
@@ -89,8 +86,8 @@ let
 
     compile = base.compile // {
       # @see https://llogiq.github.io/2017/06/01/perf-pitfalls.html
-      flags ="-D ${base.compile.deny} -Z external-macro-backtrace -Z ${base.compile.lto} -C codegen-units=${base.compile.codegen-units} -C opt-level=${base.compile.optimization-level} -C debuginfo=${base.compile.debug-level}";
-      stable-flags = "-D ${base.compile.deny} -C codegen-units=${base.compile.codegen-units} -C opt-level=${base.compile.optimization-level} -C debuginfo=${base.compile.debug-level}";
+      flags ="-D ${base.compile.deny} -Z external-macro-backtrace -Z ${base.compile.lto} -C codegen-units=${base.compile.codegen-units}";
+      stable-flags = "-D ${base.compile.deny} -C codegen-units=${base.compile.codegen-units}";
     };
 
     test = {

diff --git a/test/rust.bats b/test/rust.bats
@@ -20,5 +20,5 @@
 @test "RUSTFLAGS value" {
  result="$( echo $RUSTFLAGS )"
  echo $result
- [[ "$result" == '-D warnings -Z external-macro-backtrace -Z thinlto -C codegen-units=10 -C opt-level=z -C debuginfo=2' || "$result" == '-D warnings -C codegen-units=10 -C opt-level=z -C debuginfo=2' ]]
+ [[ "$result" == '-D warnings -Z external-macro-backtrace -Z thinlto -C codegen-units=10' || "$result" == '-D warnings -C codegen-units=10' ]]
 }