Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1319959 - Set _topsrcdir, _objdir, MOZ_BUILD_ROOT and DIST from python configure. r=gps

Browse Source 
In some cases, on OSX, python's `os.path.realpath` and shell's `pwd -P`
don't agree on the case of paths on case-insensitive filesystems.

So make everyone agree by using the value from python configure.

--HG--
extra : rebase_source : 4d26bf30f3f125c4f75d42f79d8a80a4a0bf11ec
This commit is contained in:
Mike Hommey 2016-11-24 09:47:15 +09:00
parent 3c0365a2de
commit 84aa5c4927
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/moz.configure/init.configure
View File

@ -71,6 +71,14 @@ set_config('MOZ_BUILD_ROOT', delayed_getattr(check_build_environment,
'topobjdir'))
set_config('DIST', delayed_getattr(check_build_environment, 'dist'))
add_old_configure_assignment(
'_topsrcdir', delayed_getattr(check_build_environment, 'topsrcdir'))
add_old_configure_assignment(
'_objdir', delayed_getattr(check_build_environment, 'topobjdir'))
add_old_configure_assignment(
'MOZ_BUILD_ROOT', delayed_getattr(check_build_environment, 'topobjdir'))
add_old_configure_assignment(
'DIST', delayed_getattr(check_build_environment, 'dist'))
option(env='MOZ_AUTOMATION', help='Enable options for automated builds')
set_config('MOZ_AUTOMATION', depends_if('MOZ_AUTOMATION')(lambda x: True))

10
js/src/old-configure.in
View File

@ -63,20 +63,10 @@ dnl ========================================================
USE_PTHREADS=
_PTHREAD_LDFLAGS=""
dnl Do not allow objdir == srcdir builds
dnl ==============================================================
_topsrcdir=`cd $srcdir; pwd -W 2>/dev/null || pwd -P`
_objdir=`pwd -P`
MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd -P`
MOZ_DEFAULT_COMPILER
if test -z "$JS_STANDALONE"; then
autoconfmk=autoconf-js.mk
#DIST is exported from top-level configure
else
DIST="$MOZ_BUILD_ROOT/dist"
fi
AC_SUBST(autoconfmk)

8
old-configure.in
View File

@ -80,14 +80,6 @@ dnl ========================================================
MOZ_USE_PTHREADS=
_PTHREAD_LDFLAGS=""
dnl Do not allow objdir == srcdir builds.
dnl ==============================================================
_topsrcdir=`cd \`dirname $0\`; pwd -W 2>/dev/null || pwd -P`
_objdir=`pwd -P`
MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd -P`
DIST="$MOZ_BUILD_ROOT/dist"
MOZ_DEFAULT_COMPILER
if test "$COMPILE_ENVIRONMENT"; then