Bug 1514089 - Move fxc and wine detection to toolkit/moz.configure. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 14 Dec 2018 14:56:04 +0000
changeset 450598 8d89b44a16de1138fee1ca2ed5737611c4de5097
parent 450597 8160b9f376eefdfba360fb8d1a851c6dcf4bcd93
child 450599 4a1d7cb40a363d69e46e0fd75d711b37b0cd9d97
push id35207
push useraciure@mozilla.com
push dateSat, 15 Dec 2018 02:27:37 +0000
treeherdermozilla-central@d8a944c012a7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1514089
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 1514089 - Move fxc and wine detection to toolkit/moz.configure. r=froydnj They are not necessary to build e.g. standalone spidermonkey. Differential Revision: https://phabricator.services.mozilla.com/D14513
build/moz.configure/toolchain.configure
toolkit/moz.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1446,24 +1446,16 @@ set_config('PREPROCESS_OPTION', preproce
 
 @depends(target, host)
 def is_windows(target, host):
     return host.kernel == 'WINNT' and target.kernel == 'WINNT'
 
 
 include('windows.configure', when=is_windows)
 
-# Shader Compiler for Windows (and MinGW Cross Compile)
-# ==============================================================
-
-fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target)
-                 (lambda t: t.kernel == 'WINNT'))
-wine = check_prog('WINE', ['wine'], when=depends(target, host)
-                  (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))
-
 # LTO
 # ==============================================================
 
 js_option('--enable-lto',
           nargs='?',
           choices=('full', 'thin'),
           help='Enable LTO')
 
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1263,8 +1263,17 @@ def layout_debugger(debug):
     if debug:
         return True
 
 option('--enable-layout-debugger',
        default=layout_debugger,
        help='{Enable|Disable} layout debugger')
 
 set_config('MOZ_LAYOUT_DEBUGGER', depends_if('--enable-layout-debugger')(lambda _: True))
+
+
+# Shader Compiler for Windows (and MinGW Cross Compile)
+# ==============================================================
+
+fxc = check_prog('FXC', ('fxc.exe', 'fxc2.exe'), when=depends(target)
+                 (lambda t: t.kernel == 'WINNT'))
+wine = check_prog('WINE', ['wine'], when=depends(target, host)
+                  (lambda t, h: t.kernel == 'WINNT' and h.kernel == 'Linux'))