Merge mozilla-central to fx-team
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 01 Aug 2016 09:15:19 +0200
changeset 333340 c94403616cdd5e67861c73b87e7eaec63939c375
parent 333339 482f81651a2e9b65b0066bdb99beadaa43827f29 (current diff)
parent 332572 465d150bc8be5bbf9f02a8607d4552b6a5e1697c (diff)
child 333341 3bc5415cc37d7c06e509cb49f5d4003481d49d15
push id10033
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:50:26 +0000
treeherdermozilla-aurora@5dddbefdf759 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone50.0a1
Merge mozilla-central to fx-team
--- a/browser/config/tooltool-manifests/win32/releng.manifest
+++ b/browser/config/tooltool-manifests/win32/releng.manifest
@@ -25,15 +25,15 @@
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
 },
 {
 "version": "Visual Studio 2015 Update 2 / SDK 10.0.10586.0/212",
-"size": 332442800,
-"digest": "995394a4a515c7cb0f8595f26f5395361a638870dd0bbfcc22193fe1d98a0c47126057d5999cc494f3f3eac5cb49160e79757c468f83ee5797298e286ef6252c",
+"size": 332343834,
+"digest": "55814aaabcd4aa51fe85918ec02a8c29bc067d41ee79ddcfd628daaba5a06d4241a73a51bf5a8bc69cc762b52551009f44b05e65682c45b4684c17fb2d017c2c",
 "algorithm": "sha512",
 "filename": "vs2015u2.zip",
 "unpack": true
 }
 ]
--- a/browser/config/tooltool-manifests/win64/releng.manifest
+++ b/browser/config/tooltool-manifests/win64/releng.manifest
@@ -26,15 +26,15 @@
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
 },
 {
 "version": "Visual Studio 2015 Update 2 / SDK 10.0.10586.0/212",
-"size": 332442800,
-"digest": "995394a4a515c7cb0f8595f26f5395361a638870dd0bbfcc22193fe1d98a0c47126057d5999cc494f3f3eac5cb49160e79757c468f83ee5797298e286ef6252c",
+"size": 332343834,
+"digest": "55814aaabcd4aa51fe85918ec02a8c29bc067d41ee79ddcfd628daaba5a06d4241a73a51bf5a8bc69cc762b52551009f44b05e65682c45b4684c17fb2d017c2c",
 "algorithm": "sha512",
 "filename": "vs2015u2.zip",
 "unpack": true
 }
 ]
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -45,58 +45,41 @@ def windows_sdk_dir(value, host):
 
     return tuple(x[1] for x in get_registry_values(
         r'HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots'
         r'\KitsRoot*'))
 
 # The Windows SDK 8.1 and 10 have different layouts. The former has
 # $SDK/include/$subdir, while the latter has $SDK/include/$version/$subdir.
 # The vcvars* scripts don't actually care about the version, they just take
-# the last alphanumerically.
-# The $SDK/lib directories always have version subdirectories, but while the
-# versions match the one in $SDK/include for SDK 10, it's "winv6.3" for SDK
-# 8.1.
+# the last.
 @imports('os')
 @imports('re')
 @imports(_from='__builtin__', _import='sorted')
 @imports(_from='__builtin__', _import='WindowsError')
-def get_sdk_dirs(sdk, subdir):
-    def get_dirs_containing(sdk, stem, subdir):
-        base = os.path.join(sdk, stem)
-        try:
-            subdirs = [d for d in os.listdir(base)
-                       if os.path.isdir(os.path.join(base, d))]
-        except WindowsError:
-            subdirs = []
-        if not subdirs:
-            return ()
-        if subdir in subdirs:
-            return (base,)
-        # At this point, either we have an incomplete or invalid SDK directory,
-        # or we exclusively have version numbers in subdirs.
-        return tuple(os.path.join(base, s) for s in subdirs
-                     if os.path.isdir(os.path.join(base, s, subdir)))
-
-    def categorize(dirs):
-        return {os.path.basename(d): d for d in dirs}
-
-    include_dirs = categorize(get_dirs_containing(sdk, 'include', subdir))
-    lib_dirs = categorize(get_dirs_containing(sdk, 'lib', subdir))
-
-    if 'include' in include_dirs:
-        include_dirs['winv6.3'] = include_dirs['include']
-        del include_dirs['include']
-
-    valid_versions = sorted(set(include_dirs) & set(lib_dirs), reverse=True)
-    if valid_versions:
-        return namespace(
-            path=sdk,
-            lib=lib_dirs[valid_versions[0]],
-            include=include_dirs[valid_versions[0]],
-        )
+def get_include_dir(sdk, subdir):
+    base = os.path.join(sdk, 'include')
+    try:
+        subdirs = [d for d in os.listdir(base)
+                   if os.path.isdir(os.path.join(base, d))]
+    except WindowsError:
+        subdirs = []
+    if not subdirs:
+        return None
+    if subdir in subdirs:
+        return os.path.join(base, subdir)
+    # At this point, either we have an incomplete or invalid SDK directory,
+    # or we exclusively have version numbers in subdirs.
+    versions = sorted((Version(d) for d in subdirs), reverse=True)
+    # Version('non-number').major is 0, so if the biggest version we have is
+    # 0, we have a problem.
+    if versions[0].major == 0:
+        return None
+    path = os.path.join(base, str(versions[0]), subdir)
+    return path if os.path.isdir(path) else None
 
 
 @imports(_from='mozbuild.shellutil', _import='quote')
 def valid_windows_sdk_dir_result(value):
     if value:
         return '0x%04x in %s' % (value.version, quote(value.path))
 
 @depends_win(c_compiler, windows_sdk_dir, valid_windows_version,
@@ -105,237 +88,74 @@ def valid_windows_sdk_dir_result(value):
 @imports(_from='__builtin__', _import='sorted')
 @imports(_from='textwrap', _import='dedent')
 def valid_windows_sdk_dir(compiler, windows_sdk_dir, target_version,
                           windows_sdk_dir_env):
     if windows_sdk_dir_env:
         windows_sdk_dir_env = windows_sdk_dir_env[0]
     sdks = {}
     for d in windows_sdk_dir:
-        sdk = get_sdk_dirs(d, 'um')
-        if sdk:
+        um_dir = get_include_dir(d, 'um')
+        shared_dir = get_include_dir(d, 'shared')
+        if um_dir and shared_dir:
             check = dedent('''\
             #include <winsdkver.h>
             WINVER_MAXVER
             ''')
-            um_dir = os.path.join(sdk.include, 'um')
-            shared_dir = os.path.join(sdk.include, 'shared')
             result = try_preprocess(compiler.wrapper + [compiler.compiler] +
                                     compiler.flags +
                                     ['-I', um_dir, '-I', shared_dir], 'C',
                                     check)
             if result:
                 maxver = result.splitlines()[-1]
                 try:
                     maxver = int(maxver, 0)
                 except:
                     pass
                 else:
-                    sdks[d] = maxver, sdk
+                    sdks[d] = maxver
                     continue
         if d == windows_sdk_dir_env:
             raise FatalCheckError(
                 'Error while checking the version of the SDK in '
                 'WINDOWSSDKDIR (%s). Please verify it contains a valid and '
                 'complete SDK installation.' % windows_sdk_dir_env)
 
-    valid_sdks = sorted(sdks, key=lambda x: sdks[x][0], reverse=True)
+    valid_sdks = sorted(sdks, key=lambda x: sdks[x], reverse=True)
     if valid_sdks:
-        biggest_version, sdk = sdks[valid_sdks[0]]
+        biggest_version = sdks[valid_sdks[0]]
     if not valid_sdks or biggest_version < target_version:
         if windows_sdk_dir_env:
             raise FatalCheckError(
                 'You are targeting Windows version 0x%04x, but your SDK only '
                 'supports up to version 0x%04x. Install and use an updated SDK, '
                 'or target a lower version using --with-windows-version. '
                 'Alternatively, try running the Windows SDK Configuration Tool '
                 'and selecting a newer SDK. See '
                 'https://developer.mozilla.org/En/Windows_SDK_versions for '
                 'details on fixing this.' % (target_version, biggest_version))
 
         raise FatalCheckError(
             'Cannot find a Windows SDK for version >= 0x%04x.' % target_version)
 
     return namespace(
-        path=sdk.path,
-        include=sdk.include,
-        lib=sdk.lib,
+        path=valid_sdks[0],
         version=biggest_version,
     )
 
 
 add_old_configure_assignment(
     'WINDOWSSDKDIR',
     delayed_getattr(valid_windows_sdk_dir, 'path'))
 add_old_configure_assignment(
     'MOZ_WINSDK_MAXVER',
     depends(valid_windows_sdk_dir)(
         lambda x: '0x%04X0000' % x.version if x else None))
 
 
-@imports(_from='mozbuild.shellutil', _import='quote')
-def valid_ucrt_sdk_dir_result(value):
-    if value:
-        return '%s in %s' % (value.version, quote(value.path))
-
-@depends_win(windows_sdk_dir, 'WINDOWSSDKDIR')
-@checking('for Universal CRT SDK', valid_ucrt_sdk_dir_result)
-@imports(_from='__builtin__', _import='sorted')
-def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env):
-    if windows_sdk_dir_env:
-        windows_sdk_dir_env = windows_sdk_dir_env[0]
-    sdks = {}
-    for d in windows_sdk_dir:
-        sdk = get_sdk_dirs(d, 'ucrt')
-        if sdk:
-            version = os.path.basename(sdk.include)
-            # We're supposed to always find a version in the directory, because
-            # the 8.1 SDK, which doesn't have a version in the directory, doesn't
-            # contain the Universal CRT SDK. When the main SDK is 8.1, there
-            # is, however, supposed to be a reduced install of the SDK 10
-            # with the UCRT.
-            if version != 'include':
-                sdks[d] = Version(version), sdk
-                continue
-        if d == windows_sdk_dir_env:
-            raise FatalCheckError(
-                'The SDK in WINDOWSSDKDIR (%s) does not contain the Universal '
-                'CRT.' % windows_sdk_dir_env)
-
-    valid_sdks = sorted(sdks, key=lambda x: sdks[x][0], reverse=True)
-    if not valid_sdks:
-        raise FatalCheckError('Cannot find the Universal CRT SDK. '
-                              'Please install it.')
-
-    version, sdk = sdks[valid_sdks[0]]
-
-    return namespace(
-        path=sdk.path,
-        include=sdk.include,
-        lib=sdk.lib,
-        version=version,
-    )
-
-
-@depends_win(c_compiler)
-@imports('os')
-def vc_path(c_compiler):
-    if c_compiler.type != 'msvc':
-        return
-    # Normally, we'd start from c_compiler.compiler, but for now, it's not the
-    # ideal full path to the compiler. At least, we're guaranteed find_program
-    # will get us the one we found in toolchain.configure.
-    cl = find_program(c_compiler.compiler)
-    result = os.path.dirname(cl)
-    while True:
-        next, p = os.path.split(result)
-        if next == result:
-            die('Cannot determine the Visual C++ directory the compiler (%s) '
-                'is in' % cl)
-        result = next
-        if p.lower() == 'bin':
-            break
-    return result
-
-
-@depends_win(vc_path)
-@checking('for the Debug Interface Access SDK', lambda x: x or 'not found')
-def dia_sdk_dir(vc_path):
-    if vc_path:
-        path = os.path.join(os.path.dirname(vc_path), 'DIA SDK')
-        if os.path.isdir(path):
-            return path
-
-
-@depends_win(vc_path, valid_windows_sdk_dir, valid_ucrt_sdk_dir, dia_sdk_dir)
-@imports('os')
-def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
-    if not vc_path:
-        return
-    atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'include')
-    if not os.path.isdir(atlmfc_dir):
-        die('Cannot find the ATL/MFC headers in the Visual C++ directory (%s). '
-            'Please install them.' % vc_path)
-
-    winrt_dir = os.path.join(windows_sdk_dir.include, 'winrt')
-    if not os.path.isdir(winrt_dir):
-        die('Cannot find the WinRT headers in the Windows SDK directory (%s). '
-            'Please install them.' % windows_sdk_dir.path)
-
-    includes = []
-    include_env = os.environ.get('INCLUDE')
-    if include_env:
-        includes.append(include_env)
-    includes.extend((
-        os.path.join(vc_path, 'include'),
-        atlmfc_dir,
-        os.path.join(windows_sdk_dir.include, 'shared'),
-        os.path.join(windows_sdk_dir.include, 'um'),
-        winrt_dir,
-        os.path.join(ucrt_sdk_dir.include, 'ucrt'),
-    ))
-    if dia_sdk_dir:
-        includes.append(os.path.join(dia_sdk_dir, 'include'))
-    # Set in the environment for old-configure
-    includes = os.pathsep.join(includes)
-    os.environ['INCLUDE'] = includes
-    return includes
-
-set_config('INCLUDE', include_path)
-
-
-@depends_win(target, vc_path, valid_windows_sdk_dir, valid_ucrt_sdk_dir, dia_sdk_dir)
-@imports('os')
-def lib_path(target, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
-    if not vc_path:
-        return
-    vc_target = {
-        'x86': '',
-        'x86_64': 'amd64',
-        'arm': 'arm',
-    }.get(target.cpu)
-    if vc_target is None:
-        return
-    # As vc_target can be '', and os.path.join will happily use the empty
-    # string, leading to a string ending with a backslash, that Make will
-    # interpret as a "string continues on next line" indicator, use variable
-    # args.
-    vc_target = (vc_target,) if vc_target else ()
-    sdk_target = {
-        'x86': 'x86',
-        'x86_64': 'x64',
-        'arm': 'arm',
-    }.get(target.cpu)
-
-    atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'lib', *vc_target)
-    if not os.path.isdir(atlmfc_dir):
-        die('Cannot find the ATL/MFC libraries in the Visual C++ directory (%s). '
-            'Please install them.' % vc_path)
-
-
-    libs = []
-    lib_env = os.environ.get('LIB')
-    if lib_env:
-        libs.append(lib_env)
-    libs.extend((
-        os.path.join(vc_path, 'lib', *vc_target),
-        atlmfc_dir,
-        os.path.join(windows_sdk_dir.lib, 'um', sdk_target),
-        os.path.join(ucrt_sdk_dir.lib, 'ucrt', sdk_target),
-    ))
-    if dia_sdk_dir:
-        libs.append(os.path.join(dia_sdk_dir, 'lib', *vc_target))
-    # Set in the environment for old-configure
-    libs = os.pathsep.join(libs)
-    os.environ['LIB'] = libs
-    return libs
-
-set_config('LIB', lib_path)
-
-
 option(env='MT', nargs=1, help='Path to the Microsoft Manifest Tool')
 
 @depends_win(valid_windows_sdk_dir)
 @imports(_from='os', _import='environ')
 @imports('platform')
 def sdk_bin_path(valid_windows_sdk_dir):
     if not valid_windows_sdk_dir:
         return
--- a/build/win32/mozconfig.vs2015-win64
+++ b/build/win32/mozconfig.vs2015-win64
@@ -3,21 +3,21 @@ if [ -z "${VSPATH}" ]; then
     VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u2"
     VSWINPATH="$(cd ${TOOLTOOL_DIR} && pwd -W)/vs2015u2"
 fi
 
 export WINDOWSSDKDIR="${VSWINPATH}/SDK"
 export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT"
 export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
 
-export PATH="${VSPATH}/VC/bin/amd64_x86:${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x86:${VSPATH}/SDK/bin/x64:${VSPATH}/DIA SDK/bin:${PATH}"
+export PATH="${VSPATH}/VC/bin/amd64_x86:${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x86:${VSPATH}/SDK/bin/x64:${VSPATH}/DIASDK/bin:${PATH}"
 export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC140.CRT:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${PATH}"
 
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.10586.0/ucrt:${VSPATH}/SDK/Include/10.0.10586.0/shared:${VSPATH}/SDK/Include/10.0.10586.0/um:${VSPATH}/SDK/Include/10.0.10586.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib:${VSPATH}/VC/atlmfc/lib:${VSPATH}/SDK/lib/10.0.10586.0/ucrt/x86:${VSPATH}/SDK/lib/10.0.10586.0/um/x86:${VSPATH}/DIA SDK/lib"
+export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/ucrt:${VSPATH}/SDK/Include/shared:${VSPATH}/SDK/Include/um:${VSPATH}/SDK/Include/winrt:${VSPATH}/DIASDK/include"
+export LIB="${VSPATH}/VC/lib:${VSPATH}/VC/atlmfc/lib:${VSPATH}/SDK/lib/ucrt/x86:${VSPATH}/SDK/lib/um/x86:${VSPATH}/DIASDK/lib"
 
 . $topsrcdir/build/mozconfig.vs-common
 
 mk_export_correct_style INCLUDE
 mk_export_correct_style LIB
 mk_export_correct_style PATH
 mk_export_correct_style WIN32_REDIST_DIR
 mk_export_correct_style WIN_UCRT_REDIST_DIR
--- a/build/win64/mozconfig.vs2015
+++ b/build/win64/mozconfig.vs2015
@@ -3,20 +3,20 @@ if [ -z "${VSPATH}" ]; then
     VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2015u2"
     VSWINPATH="$(cd ${TOOLTOOL_DIR} && pwd -W)/vs2015u2"
 fi
 
 export WINDOWSSDKDIR="${VSWINPATH}/SDK"
 export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT
 export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
 
-export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIA SDK/bin/amd64:${PATH}"
+export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIASDK/bin/amd64:${PATH}"
 
-export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.10586.0/ucrt:${VSPATH}/SDK/Include/10.0.10586.0/shared:${VSPATH}/SDK/Include/10.0.10586.0/um:${VSPATH}/SDK/Include/10.0.10586.0/winrt:${VSPATH}/DIA SDK/include"
-export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/10.0.10586.0/ucrt/x64:${VSPATH}/SDK/lib/10.0.10586.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
+export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/ucrt:${VSPATH}/SDK/Include/shared:${VSPATH}/SDK/Include/um:${VSPATH}/SDK/Include/winrt:${VSPATH}/DIASDK/include"
+export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/ucrt/x64:${VSPATH}/SDK/lib/um/x64:${VSPATH}/DIASDK/lib/amd64"
 
 . $topsrcdir/build/mozconfig.vs-common
 
 mk_export_correct_style INCLUDE
 mk_export_correct_style LIB
 mk_export_correct_style PATH
 mk_export_correct_style WIN32_REDIST_DIR
 mk_export_correct_style WIN_UCRT_REDIST_DIR
--- a/build/windows_toolchain.py
+++ b/build/windows_toolchain.py
@@ -24,28 +24,33 @@ from mozpack.mozjar import (
 )
 import mozpack.path as mozpath
 
 
 # mozpack.match patterns for files under "Microsoft Visual Studio 14.0".
 VS_PATTERNS = [
     {
         'pattern': 'DIA SDK/bin/**',
+        # Various tools don't like spaces in filenames. So remove it.
+        'rewrite': [('DIA SDK/', 'DIASDK/')],
         'ignore': (
             'DIA SDK/bin/arm/**',
         ),
     },
     {
         'pattern': 'DIA SDK/idl/**',
+        'rewrite': [('DIA SDK/', 'DIASDK/')],
     },
     {
         'pattern': 'DIA SDK/include/**',
+        'rewrite': [('DIA SDK/', 'DIASDK/')],
     },
     {
         'pattern': 'DIA SDK/lib/**',
+        'rewrite': [('DIA SDK/', 'DIASDK/')],
         'ignore': (
             'DIA SDK/lib/arm/**',
         ),
     },
     # ATL is needed by Breakpad.
     {
         'pattern': 'VC/atlmfc/include/**',
     },
@@ -150,22 +155,28 @@ def resolve_files():
     vs_path, sdk_path = find_vs_paths()
 
     for entry in VS_PATTERNS:
         finder = FileFinder(vs_path, find_executables=False,
                             ignore=entry.get('ignore', []))
         for p, f in finder.find(entry['pattern']):
             assert p.startswith(('VC/', 'DIA SDK/'))
 
+            for source, dest in entry.get('rewrite', []):
+                p = p.replace(source, dest)
+
             yield p.encode('utf-8'), f
 
     for entry in SDK_PATTERNS:
         finder = FileFinder(sdk_path, find_executables=False,
                             ignore=entry.get('ignore', []))
         for p, f in finder.find(entry['pattern']):
+            # We remove the SDK version from the path so we don't have
+            # to update other configs when we change the SDK version.
+            p = p.replace('/%s/' % SDK_RELEASE, '/')
             relpath = 'SDK/%s' % p
 
             yield relpath.encode('utf-8'), f
 
 
 def resolve_files_and_hash(manifest):
     """Resolve files and hash their data.
 
--- a/config/config.mk
+++ b/config/config.mk
@@ -353,28 +353,16 @@ SDK_LIB_DIR = $(DIST)/sdk/lib
 SDK_BIN_DIR = $(DIST)/sdk/bin
 
 DEPENDENCIES	= .md
 
 ifdef MACOSX_DEPLOYMENT_TARGET
 export MACOSX_DEPLOYMENT_TARGET
 endif # MACOSX_DEPLOYMENT_TARGET
 
-# Export to propagate to cl and submake for third-party code.
-# Eventually, we'll want to just use -I.
-ifdef INCLUDE
-export INCLUDE
-endif
-
-# Export to propagate to link.exe and submake for third-party code.
-# Eventually, we'll want to just use -LIBPATH.
-ifdef LIB
-export LIB
-endif
-
 ifdef MOZ_USING_CCACHE
 ifdef CLANG_CXX
 export CCACHE_CPP2=1
 endif
 endif
 
 # Set link flags according to whether we want a console.
 ifeq ($(OS_ARCH),WINNT)