Bug 1224460 - Use pwd -W to fill _topsrcdir in configure. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 17 Nov 2015 18:31:08 +0900
changeset 309164 aeebc4c5fba749ff96936ce56916f7cea604e1a4
parent 309163 082fd246bfd39fafdc66dcc4e68cf7f97b1aaf6c
child 309165 53e32f626afc96a6a5abfa71b241a047eb9a7d88
push id1040
push userraliiev@mozilla.com
push dateMon, 29 Feb 2016 17:11:22 +0000
treeherdermozilla-release@8c3167321162 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1224460
milestone45.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 1224460 - Use pwd -W to fill _topsrcdir in configure. r=gps We're going to be using -I$_topsrcdir in some CFLAGS variables, and for that we need windows-y paths, not msys paths. All things currently using $_topsrcdir should cope with this just fine.
configure.in
js/src/configure.in
--- a/configure.in
+++ b/configure.in
@@ -87,17 +87,17 @@ AC_PROG_AWK
 dnl Initialize the Pthread test variables early so they can be
 dnl  overridden by each platform.
 dnl ========================================================
 MOZ_USE_PTHREADS=
 _PTHREAD_LDFLAGS=""
 
 dnl Do not allow objdir == srcdir builds.
 dnl ==============================================================
-_topsrcdir=`cd \`dirname $0\`; pwd`
+_topsrcdir=`cd \`dirname $0\`; pwd -W 2>/dev/null || pwd`
 _objdir=`pwd`
 
 dnl TODO Don't exempt L10N builds once bug 842760 is resolved.
 if test "$_topsrcdir" = "$_objdir" -a "${with_l10n_base+set}" != set; then
   echo "  ***"
   echo "  * Building directly in the main source directory is not allowed."
   echo "  *"
   echo "  * To build, you must run configure from a separate directory"
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -68,17 +68,17 @@ AC_PROG_AWK
 dnl Initialize the Pthread test variables early so they can be
 dnl  overridden by each platform.
 dnl ========================================================
 USE_PTHREADS=
 _PTHREAD_LDFLAGS=""
 
 dnl Do not allow objdir == srcdir builds
 dnl ==============================================================
-_topsrcdir=`cd $srcdir; pwd`
+_topsrcdir=`cd $srcdir; pwd -W 2>/dev/null || pwd`
 _objdir=`pwd`
 
 if test "$_topsrcdir" = "$_objdir"
 then
   echo "  ***"
   echo "  * Building directly in the main source directory is not allowed."
   echo "  *"
   echo "  * To build, you must run configure from a separate directory"