From 4836d8fa0a1086703982f09386bb404cdd527ab0 Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Sun, 5 Aug 2012 21:07:19 -0700 Subject: [PATCH] Bug 780414: Followup to fix my build. Sort-of-but-not-really-r=Callek --- build/ConfigStatus.py | 4 ++-- js/src/build/ConfigStatus.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/ConfigStatus.py b/build/ConfigStatus.py index 37bb78ca77fb..6b53b07c2380 100644 --- a/build/ConfigStatus.py +++ b/build/ConfigStatus.py @@ -8,7 +8,7 @@ from __future__ import with_statement from optparse import OptionParser -import sys, re, os, posixpath +import sys, re, os, posixpath, ntpath from StringIO import StringIO # Standalone js doesn't have virtualenv. sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config')) @@ -153,7 +153,7 @@ class ConfigEnvironment(object): substs['top_srcdir'] is a relative path, it is relative to the topobjdir. Adjust it to be relative to the file path.''' top_srcdir = self.substs['top_srcdir'] - if posixpath.isabs(top_srcdir): + if posixpath.isabs(top_srcdir) or ntpath.isabs(top_srcdir): return top_srcdir return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir)) diff --git a/js/src/build/ConfigStatus.py b/js/src/build/ConfigStatus.py index 37bb78ca77fb..6b53b07c2380 100644 --- a/js/src/build/ConfigStatus.py +++ b/js/src/build/ConfigStatus.py @@ -8,7 +8,7 @@ from __future__ import with_statement from optparse import OptionParser -import sys, re, os, posixpath +import sys, re, os, posixpath, ntpath from StringIO import StringIO # Standalone js doesn't have virtualenv. sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'config')) @@ -153,7 +153,7 @@ class ConfigEnvironment(object): substs['top_srcdir'] is a relative path, it is relative to the topobjdir. Adjust it to be relative to the file path.''' top_srcdir = self.substs['top_srcdir'] - if posixpath.isabs(top_srcdir): + if posixpath.isabs(top_srcdir) or ntpath.isabs(top_srcdir): return top_srcdir return posixpath.normpath(posixpath.join(self.get_depth(file), top_srcdir))