Merge pull request jl777#271 from BloodyNora/dev

do not use '-Wno-builtin-declaration-mismatch on GCC <v7
Cryptoforge-alt · Jan 3, 2020 · 3b02875 · 3b02875
2 parents 440a2fb + 972ab83
commit 3b02875
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/zcutil/build.sh b/zcutil/build.sh
@@ -104,5 +104,12 @@ ld -v
 HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1
 ./autogen.sh
 
-CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CPPFLAGS='-g -Wno-builtin-declaration-mismatch -Werror' CXXFLAGS='-g'
+# 0x03 2020-01-03, do not use '-Wno-builtin-declaration-mismatch on GCC <v7
+if [ "$(gcc --version|head -1 | awk '{print $4}' | cut -d"." -f1)" -lt 7 ]; then
+	# version <7
+	CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CPPFLAGS='-g -Werror' CXXFLAGS='-g'
+else
+	# version 7 and up
+	CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CPPFLAGS='-g -Wno-builtin-declaration-mismatch -Werror' CXXFLAGS='-g'
+fi
 "$MAKE" "$@" V=1