Bug 1417958 - Normalize lib paths to appease VS2017's incremental linking. r=nalexander, a=npotb
authorDavid Major <dmajor@mozilla.com>
Fri, 17 Nov 2017 09:15:00 -0500
changeset 442562 bacdbc0d22f0d935ff882adb77938cc67a90ebab
parent 442561 0d20053d08059d9385759d69a7be7f983ca25e05
child 442563 88bd9da5a3964e897a9933cf70e827f0ab52f83d
push id8253
push userryanvm@gmail.com
push dateTue, 28 Nov 2017 20:44:48 +0000
treeherdermozilla-beta@4acde7e42314 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, npotb
bugs1417958
milestone58.0
Bug 1417958 - Normalize lib paths to appease VS2017's incremental linking. r=nalexander, a=npotb
build/moz.configure/windows.configure
config/expandlibs_exec.py
--- a/build/moz.configure/windows.configure
+++ b/build/moz.configure/windows.configure
@@ -255,17 +255,17 @@ def vc_path(c_compiler):
     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
+    return os.path.normpath(result)
 
 
 @depends(vc_path, c_compiler)
 @checking('for the Debug Interface Access SDK', lambda x: x or 'not found')
 @imports(_from='os.path', _import='isdir')
 def dia_sdk_dir(vc_path, c_compiler):
     if vc_path:
         if c_compiler.version < '19.10':
--- a/config/expandlibs_exec.py
+++ b/config/expandlibs_exec.py
@@ -137,17 +137,17 @@ class ExpandArgsMore(ExpandArgs):
             os.close(fd)
             os.remove(tmp)
             return
         self.tmp.append(tmp)
         f = os.fdopen(fd, "w")
         f.writelines(content)
         f.close()
         idx = self.index(objs[0])
-        newlist = self[0:idx] + [ref] + [item for item in self[idx:] if item not in objs]
+        newlist = self[0:idx] + [ref] + [os.path.normpath(item) for item in self[idx:] if item not in objs]
         self[0:] = newlist
 
     def _getFoldedSections(self):
         '''Returns a dict about folded sections.
         When section A and B are folded into section C, the dict contains:
         { 'A': 'C',
           'B': 'C',
           'C': ['A', 'B'] }'''