trunk-tracking: merge in master

2014-04-17 10:49:58 -04:00
parent e9a099f9c5 323e820fde
commit af10fc3ddb
2 changed files with 9 additions and 5 deletions
@@ -109,6 +109,10 @@ case "$NGX_GCC_VER" in
  ;;
 esac

+if [ "$WNO_ERROR" = "YES" ]; then
+    CFLAGS="$CFLAGS -Wno-error"
+fi
+
 pagespeed_include="\
  $mod_pagespeed_dir \
  $mod_pagespeed_dir/third_party/chromium/src \