Auto merge of #4837 - daira:fix-gitian, r=daira

Fixes for Gitian builds Remove manual CFLAGS and CXXFLAGS from descriptor.
zcash · Oct 29, 2020 · 2a78e35 · 2a78e35
2 parents 75f1a46 + 6cbaa65
commit 2a78e35
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -32,12 +32,12 @@ files: []
 script: |
   WRAP_DIR=$HOME/wrapped
   HOSTS="x86_64-linux-gnu"
-  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --enable-hardening"
+  CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --enable-hardening --enable-werror"
   MAKEOPTS="V=1"
   FAKETIME_HOST_PROGS=""
   FAKETIME_PROGS="date ar ranlib nm strip objcopy"
-  HOST_CFLAGS="-fwrapv -fno-strict-aliasing -Werror -g"
-  HOST_CXXFLAGS="-fwrapv -fno-strict-aliasing -Werror -g"
+  HOST_CFLAGS=""
+  HOST_CXXFLAGS=""
   HOST_LDFLAGS=-static-libstdc++
 
   export QT_RCC_TEST=0