Backed out changeset 8e348821b49f (bug 1513009) due to build compile failure on a CLOSED TREE
authorGurzau Raul <rgurzau@mozilla.com>
Fri, 14 Dec 2018 01:56:43 +0200
changeset 450481 105fc79aee5ffe6b5f6a5973f3e4878cc4b8e198
parent 450480 fabd9a347ca2d02a88475c98cb03a4a2e383e5df
child 450482 a704ad19e3ad3ce99f3aa5addfc57c144e54c4fd
push id35202
push userbtara@mozilla.com
push dateFri, 14 Dec 2018 05:43:22 +0000
treeherdermozilla-central@f758b5149686 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1513009
milestone66.0a1
backs out8e348821b49fa0913c8ce9c5be9b8787a7d8f970
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8e348821b49f (bug 1513009) due to build compile failure on a CLOSED TREE
build/moz.configure/flags.configure
build/moz.configure/toolchain.configure
build/moz.configure/warnings.configure
--- a/build/moz.configure/flags.configure
+++ b/build/moz.configure/flags.configure
@@ -11,14 +11,8 @@ check_and_add_gcc_flag('-fno-sized-deall
 # Please keep these last in this file.
 add_old_configure_assignment('_COMPILATION_CFLAGS', compilation_flags.cflags)
 add_old_configure_assignment(
     '_COMPILATION_CXXFLAGS', compilation_flags.cxxflags)
 add_old_configure_assignment(
     '_COMPILATION_HOST_CFLAGS', compilation_flags.host_cflags)
 add_old_configure_assignment(
     '_COMPILATION_HOST_CXXFLAGS', compilation_flags.host_cxxflags)
-
-@depends(rust_compile_flags, rust_warning_flags)
-def rust_flags(compile_flags, warning_flags):
-    return compile_flags + warning_flags
-
-set_config('MOZ_RUST_DEFAULT_FLAGS', rust_flags)
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1650,17 +1650,17 @@ imply_option('RUSTC_OPT_LEVEL', '2', whe
 def rustc_opt_level(opt_level_option, moz_optimize):
     if opt_level_option:
         return opt_level_option[0]
     else:
         return '1' if moz_optimize.optimize else '0'
 
 
 @depends(rustc_opt_level, debug_rust, '--enable-debug-symbols')
-def rust_compile_flags(opt_level, debug_rust, debug_symbols):
+def rust_compiler_flags(opt_level, debug_rust, debug_symbols):
     # Cargo currently supports only two interesting profiles for building:
     # development and release. Those map (roughly) to --enable-debug and
     # --disable-debug in Gecko, respectively.
     #
     # But we'd also like to support an additional axis of control for
     # optimization level. Since Cargo only supports 2 profiles, we're in
     # a bit of a bind.
     #
@@ -1691,16 +1691,18 @@ def rust_compile_flags(opt_level, debug_
 
     flags = []
     for opt in opts:
         flags.extend(['-C', opt])
 
     return flags
 
 
+set_config('MOZ_RUST_DEFAULT_FLAGS', rust_compiler_flags)
+
 # Rust incremental compilation
 # ==============================================================
 
 
 @depends(rustc_opt_level, debug_rust, 'MOZ_AUTOMATION', code_coverage)
 def cargo_incremental(opt_level, debug_rust, automation, code_coverage):
     """Return a value for the CARGO_INCREMENTAL environment variable."""
 
--- a/build/moz.configure/warnings.configure
+++ b/build/moz.configure/warnings.configure
@@ -8,27 +8,16 @@ js_option('--enable-warnings-as-errors',
           default=depends('MOZ_AUTOMATION')(lambda x: bool(x)),
           help='{Enable|Disable} treating warnings as errors')
 
 add_old_configure_assignment(
     'MOZ_ENABLE_WARNINGS_AS_ERRORS',
     depends('--enable-warnings-as-errors')(lambda x: bool(x)))
 
 
-@depends('--enable-warnings-as-errors')
-def rust_warning_flags(warnings_as_errors):
-    flags = []
-
-    # Note that cargo passes --cap-lints warn to rustc for third-party code, so
-    # we don't need a very complicated setup.
-    if warnings_as_errors:
-        flags.append('-Dwarnings')
-
-    return flags
-
 # GCC/Clang warnings:
 # https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
 # https://clang.llvm.org/docs/DiagnosticsReference.html
 
 # lots of useful warnings
 add_gcc_warning('-Wall')
 
 # catch implicit truncation of enum values assigned to smaller bit fields