From 02c9050df5e537f4aa7806ff63772dcff806f416 Mon Sep 17 00:00:00 2001 From: David Major Date: Fri, 17 Nov 2017 09:15:00 -0500 Subject: [PATCH] Bug 1417958 - Normalize lib paths to appease VS2017's incremental linking. r=nalexander --HG-- extra : rebase_source : d834aef165b35fec0c880656976267e03d68180d --- build/moz.configure/windows.configure | 2 +- config/expandlibs_exec.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure index f0c4712660242..9a6438ddc9a93 100644 --- a/build/moz.configure/windows.configure +++ b/build/moz.configure/windows.configure @@ -260,7 +260,7 @@ def vc_path(c_compiler): result = next if p.lower() == 'bin': break - return result + return os.path.normpath(result) @depends(vc_path, c_compiler) diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py index c05343022959a..df656016c991a 100644 --- a/config/expandlibs_exec.py +++ b/config/expandlibs_exec.py @@ -142,7 +142,7 @@ def makelist(self): 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):