Bug 1227852 - Remove the --with-dist-dir configure flag from js/src/. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 25 Nov 2015 14:09:41 +0900
changeset 308928 532da45ad3b5d2db7cc54364f459c4e7618e4763
parent 308927 ea00141d4b5aff18764b128a328f7cb3a69ee260
child 308929 19337a91ada3053765f0c8ba5b97b902d84610d4
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1227852
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 1227852 - Remove the --with-dist-dir configure flag from js/src/. r=mshal
config/baseconfig.mk
js/src/configure.in
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,27 +1,20 @@
 # This file is normally included by autoconf.mk, but it is also used
 # directly in python/mozbuild/mozbuild/base.py for gmake validation.
 # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
 # whether a normal build is happening or whether the check is running.
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-ifndef TOP_DIST
-TOP_DIST = dist
-endif
-ifneq (,$(filter /%,$(TOP_DIST)))
-DIST = $(TOP_DIST)
+ifeq (.,$(DEPTH))
+DIST = dist
 else
-ifeq (.,$(DEPTH))
-DIST = $(TOP_DIST)
-else
-DIST = $(DEPTH)/$(TOP_DIST)
-endif
+DIST = $(DEPTH)/dist
 endif
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
 _OBJ_SUFFIX := $(OBJ_SUFFIX)
 OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX)
 
 ifeq ($(HOST_OS_ARCH),WINNT)
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -109,27 +109,16 @@ if test "$_conflict_files"; then
 	*     2. gmake distclean
 	***
 	EOF
   exit 1
   break
 fi
 MOZ_BUILD_ROOT=`pwd -W 2>/dev/null || pwd`
 
-dnl Choose where to put the 'dist' directory.
-dnl ==============================================================
-
-MOZ_ARG_WITH_STRING(dist-dir,
-[  --with-dist-dir=DIR     Use DIR as 'dist' staging area.  DIR may be
-                          relative to the top of SpiderMonkey build tree,
-                          or absolute.],
-    TOP_DIST=$withval,
-    TOP_DIST=dist)
-AC_SUBST(TOP_DIST)
-
 MOZ_BUILD_BACKEND
 
 MOZ_DEFAULT_COMPILER
 
 COMPILE_ENVIRONMENT=1
 MOZ_ARG_DISABLE_BOOL(compile-environment,
 [  --disable-compile-environment
                           Disable compiler/library checks.],