Bug 1519040 - Remove some unused old-configure assignments. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 10 Jan 2019 22:02:04 +0000
changeset 453355 3f00314f0fe03d7b9166323326a136349b17b736
parent 453354 afe2372f339b1b157b8acbe42fa90c672f5bdda1
child 453356 1c8e5a4781fc7fe9ccd63012c6dc61bac25fc459
push id35352
push userdvarga@mozilla.com
push dateFri, 11 Jan 2019 04:12:48 +0000
treeherdermozilla-central@65326bd78f83 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1519040
milestone66.0a1
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
Bug 1519040 - Remove some unused old-configure assignments. r=mshal Differential Revision: https://phabricator.services.mozilla.com/D16159
build/moz.configure/init.configure
build/moz.configure/memory.configure
build/moz.configure/rust.configure
build/moz.configure/toolchain.configure
js/ffi.configure
js/moz.configure
moz.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -866,18 +866,16 @@ def target_variables(target):
 
 set_config('OS_TARGET', target_variables.OS_TARGET)
 add_old_configure_assignment('OS_TARGET',
                              target_variables.OS_TARGET)
 set_config('OS_ARCH', target_variables.OS_ARCH)
 add_old_configure_assignment('OS_ARCH',
                              target_variables.OS_ARCH)
 set_config('OS_TEST', target_variables.OS_TEST)
-add_old_configure_assignment('OS_TEST',
-                             target_variables.OS_TEST)
 set_config('CPU_ARCH', target.cpu)
 add_old_configure_assignment('CPU_ARCH', target.cpu)
 set_config('INTEL_ARCHITECTURE', target_variables.INTEL_ARCHITECTURE)
 set_config('TARGET_CPU', target.raw_cpu)
 set_config('TARGET_OS', target.raw_os)
 set_config('TARGET_ENDIANNESS', target.endianness)
 
 
@@ -1137,17 +1135,16 @@ def milestone(build_env, build_project, 
                      is_release_or_beta=is_release_or_beta,
                      app_version=app_version,
                      app_version_display=app_version_display)
 
 
 set_config('GRE_MILESTONE', milestone.version)
 set_config('NIGHTLY_BUILD', milestone.is_nightly)
 set_define('NIGHTLY_BUILD', milestone.is_nightly)
-add_old_configure_assignment('NIGHTLY_BUILD', milestone.is_nightly)
 set_config('RELEASE_OR_BETA', milestone.is_release_or_beta)
 set_define('RELEASE_OR_BETA', milestone.is_release_or_beta)
 add_old_configure_assignment('RELEASE_OR_BETA',
                              milestone.is_release_or_beta)
 set_define('MOZILLA_VERSION', depends(milestone)(lambda m: '"%s"' % m.version))
 set_config('MOZILLA_VERSION', milestone.version)
 set_define('MOZILLA_VERSION_U', milestone.version)
 set_define('MOZILLA_UAVERSION', depends(milestone)(lambda m: '"%s"' % m.uaversion))
--- a/build/moz.configure/memory.configure
+++ b/build/moz.configure/memory.configure
@@ -53,17 +53,16 @@ def replace_malloc(value, jemalloc, mile
     if build_project == 'memory':
         return True
     if milestone.is_nightly and jemalloc and build_project != 'js':
         return True
 
 
 set_config('MOZ_REPLACE_MALLOC', replace_malloc)
 set_define('MOZ_REPLACE_MALLOC', replace_malloc)
-add_old_configure_assignment('MOZ_REPLACE_MALLOC', replace_malloc)
 
 
 @depends(replace_malloc, build_project)
 def replace_malloc_static(replace_malloc, build_project):
     # Default to statically linking replace-malloc libraries that can be
     # statically linked, except when building with --enable-project=memory.
     if replace_malloc and build_project != 'memory':
         return True
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -256,17 +256,16 @@ def rust_target_env_name(triple):
 # converting a string to uppercase.
 set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
 
 # This is used for putting source info into symbol files.
 set_config('RUSTC_COMMIT', depends(rustc_info)(lambda i: i.commit))
 
 # Until we remove all the other Rust checks in old-configure.
 add_old_configure_assignment('RUSTC', rustc)
-add_old_configure_assignment('RUST_TARGET', rust_target_triple)
 
 # Rustdoc is required by Rust tests below.
 js_option(env='RUSTDOC', nargs=1, help='Path to the rustdoc program')
 
 rustdoc = check_prog('RUSTDOC', add_rustup_path('rustdoc'),
                      input='RUSTDOC', allow_missing=True)
 
 # This option is separate from --enable-tests because Rust tests are particularly
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -371,19 +371,16 @@ def compiler_wrapper(wrapper, ccache):
         if wrapper:
             return tuple([ccache] + wrapper)
         else:
             return (ccache,)
     elif wrapper:
         return tuple(wrapper)
 
 
-add_old_configure_assignment('COMPILER_WRAPPER', compiler_wrapper)
-
-
 @depends_if(compiler_wrapper)
 def using_compiler_wrapper(compiler_wrapper):
     return True
 
 
 set_config('MOZ_USING_COMPILER_WRAPPER', using_compiler_wrapper)
 
 
@@ -1481,19 +1478,16 @@ def is_windows(target, host):
 
 include('windows.configure', when=is_windows)
 
 # PGO
 # ==============================================================
 llvm_profdata = check_prog('LLVM_PROFDATA', ['llvm-profdata'],
                            allow_missing=True)
 
-add_old_configure_assignment('LLVM_PROFDATA', llvm_profdata)
-
-
 js_option('--enable-profile-generate',
           help='Build a PGO instrumented binary')
 
 imply_option('MOZ_PGO',
              depends_if('--enable-profile-generate')(lambda _: True))
 
 set_config('MOZ_PROFILE_GENERATE',
            depends_if('--enable-profile-generate')(lambda _: True))
--- a/js/ffi.configure
+++ b/js/ffi.configure
@@ -18,17 +18,16 @@ js_option('--with-system-ffi',
 use_system_ffi = depends_if('--with-system-ffi')(lambda _: True)
 
 system_ffi = pkg_check_modules('MOZ_FFI', 'libffi > 3.0.9',
                                when=use_system_ffi)
 
 building_ffi = depends(system_ffi)(lambda v: v is None)
 
 set_config('MOZ_SYSTEM_FFI', depends_if(system_ffi)(lambda _: True))
-add_old_configure_assignment('MOZ_SYSTEM_FFI', depends_if(system_ffi)(lambda _: True))
 
 # Target selection, based on ffi/configure.ac.
 @depends(target, when=building_ffi)
 def ffi_target(target):
     if target.cpu not in ('x86', 'x86_64', 'arm', 'aarch64'):
         die('Building libffi from the tree is not supported on this platform. '
             'Use --with-system-ffi instead.')
 
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -408,26 +408,24 @@ def ctypes_default(building_js):
 js_option('--enable-ctypes',
           default=ctypes_default,
           help='{Enable|Disable} js-ctypes')
 
 build_ctypes = depends_if('--enable-ctypes')(lambda _: True)
 
 set_config('BUILD_CTYPES', build_ctypes)
 set_define('BUILD_CTYPES', build_ctypes)
-add_old_configure_assignment('BUILD_CTYPES', build_ctypes)
 
 @depends(build_ctypes, building_js)
 def js_has_ctypes(ctypes, js):
     if ctypes and js:
         return True
 
 set_config('JS_HAS_CTYPES', js_has_ctypes)
 set_define('JS_HAS_CTYPES', js_has_ctypes)
-add_old_configure_assignment('JS_HAS_CTYPES', js_has_ctypes)
 
 @depends('--enable-ctypes', '--enable-compile-environment')
 def ctypes_and_compile_environment(ctypes, compile_environment):
     return ctypes and compile_environment
 
 include('ffi.configure', when=ctypes_and_compile_environment)
 
 
--- a/moz.configure
+++ b/moz.configure
@@ -117,17 +117,16 @@ def debug_rust():
     return True
 
 set_config('MOZ_DEBUG_RUST', debug_rust)
 set_define('MOZ_DEBUG_RUST', debug_rust)
 
 js_option(env='MOZ_PGO', help='Build with profile guided optimizations')
 
 set_config('MOZ_PGO', depends('MOZ_PGO')(lambda x: bool(x)))
-add_old_configure_assignment('MOZ_PGO', depends('MOZ_PGO')(lambda x: bool(x)))
 
 include('build/moz.configure/pkg.configure')
 # Make this assignment here rather than in pkg.configure to avoid
 # requiring this file in unit tests.
 add_old_configure_assignment('PKG_CONFIG', pkg_config)
 
 include('build/moz.configure/toolchain.configure',
         when='--enable-compile-environment')