Bug 873325 - Normalize topobjdir to an absolute path; r=glandium
authorGregory Szorc <gps@mozilla.com>
Mon, 20 May 2013 09:45:54 -0700
changeset 143924 77d1e65e48e2e0390d99c36aecf54d3cb56fe84a
parent 143923 f9f5496fdca8b9ad72695c9478816e60fb4ef8bd
child 143925 8bce57ee8b173e3aa7bfc2bcf53c8db416051776
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs873325
milestone24.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 873325 - Normalize topobjdir to an absolute path; r=glandium
build/autoconf/config.status.m4
js/src/build/autoconf/config.status.m4
--- a/build/autoconf/config.status.m4
+++ b/build/autoconf/config.status.m4
@@ -83,17 +83,17 @@ cat > $CONFIG_STATUS <<EOF
 import os
 dnl topsrcdir is the top source directory in native form, as opposed to a
 dnl form suitable for make.
 topsrcdir = '''${WIN_TOP_SRC:-$srcdir}'''
 if not os.path.isabs(topsrcdir):
     rel = os.path.join(os.path.dirname(<<<__file__>>>), topsrcdir)
     topsrcdir = os.path.normpath(os.path.abspath(rel))
 
-topobjdir = os.path.dirname(<<<__file__>>>)
+topobjdir = os.path.abspath(os.path.dirname(<<<__file__>>>))
 
 dnl All defines and substs are stored with an additional space at the beginning
 dnl and at the end of the string, to avoid any problem with values starting or
 dnl ending with quotes.
 defines = [(name[1:-1], value[1:-1]) for name, value in [
 EOF
 
 dnl confdefs.pytmp contains AC_DEFINEs, in the expected format, but
--- a/js/src/build/autoconf/config.status.m4
+++ b/js/src/build/autoconf/config.status.m4
@@ -83,17 +83,17 @@ cat > $CONFIG_STATUS <<EOF
 import os
 dnl topsrcdir is the top source directory in native form, as opposed to a
 dnl form suitable for make.
 topsrcdir = '''${WIN_TOP_SRC:-$srcdir}'''
 if not os.path.isabs(topsrcdir):
     rel = os.path.join(os.path.dirname(<<<__file__>>>), topsrcdir)
     topsrcdir = os.path.normpath(os.path.abspath(rel))
 
-topobjdir = os.path.dirname(<<<__file__>>>)
+topobjdir = os.path.abspath(os.path.dirname(<<<__file__>>>))
 
 dnl All defines and substs are stored with an additional space at the beginning
 dnl and at the end of the string, to avoid any problem with values starting or
 dnl ending with quotes.
 defines = [(name[1:-1], value[1:-1]) for name, value in [
 EOF
 
 dnl confdefs.pytmp contains AC_DEFINEs, in the expected format, but