зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1490463 - part 3 - remove BUILD_TOOLS from config.mk; r=mshal
BUILD_TOOLS was only ever used for things that another variable provides equally well. Removing BUILD_TOOLS means that we can remove win_srcdir and WIN_TOP_SRC as well.
This commit is contained in:
Родитель
90962198d5
Коммит
115b2651d5
|
@ -100,16 +100,7 @@ ifelse($#, 2, _MOZ_AC_DEFINE_UNQUOTED($1, $2), $#, 3, _MOZ_AC_DEFINE_UNQUOTED($1
|
|||
|
||||
dnl Replace AC_OUTPUT to create and call a python config.status
|
||||
define([MOZ_CREATE_CONFIG_STATUS],
|
||||
[dnl Top source directory in Windows format (as opposed to msys format).
|
||||
WIN_TOP_SRC=
|
||||
case "$host_os" in
|
||||
mingw*)
|
||||
WIN_TOP_SRC=`cd $srcdir; pwd -W`
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(WIN_TOP_SRC)
|
||||
|
||||
dnl Used in all Makefile.in files
|
||||
[dnl Used in all Makefile.in files
|
||||
top_srcdir=$srcdir
|
||||
AC_SUBST(top_srcdir)
|
||||
|
||||
|
|
|
@ -103,22 +103,6 @@ endif
|
|||
# The VERSION_NUMBER is suffixed onto the end of the DLLs we ship.
|
||||
VERSION_NUMBER = 50
|
||||
|
||||
ifeq ($(HOST_OS_ARCH),WINNT)
|
||||
ifeq ($(MOZILLA_DIR),$(topsrcdir))
|
||||
win_srcdir := $(subst $(topsrcdir),$(WIN_TOP_SRC),$(srcdir))
|
||||
else
|
||||
# This means we're in comm-central's topsrcdir, so we need to adjust
|
||||
# WIN_TOP_SRC (which points to mozilla's topsrcdir) for the substitution
|
||||
# to win_srcdir.
|
||||
cc_WIN_TOP_SRC := $(WIN_TOP_SRC:%/mozilla=%)
|
||||
win_srcdir := $(subst $(topsrcdir),$(cc_WIN_TOP_SRC),$(srcdir))
|
||||
endif
|
||||
BUILD_TOOLS = $(WIN_TOP_SRC)/build/unix
|
||||
else
|
||||
win_srcdir := $(srcdir)
|
||||
BUILD_TOOLS = $(MOZILLA_DIR)/build/unix
|
||||
endif
|
||||
|
||||
CONFIG_TOOLS = $(MOZ_BUILD_ROOT)/config
|
||||
AUTOCONF_TOOLS = $(MOZILLA_DIR)/build/autoconf
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ EXEC = exec
|
|||
# prints out failed commands anyway, so ELOG just makes things worse by
|
||||
# forcing shell invocations.
|
||||
ifneq (,$(findstring -s, $(filter-out --%, $(MAKEFLAGS))))
|
||||
ELOG := $(EXEC) sh $(BUILD_TOOLS)/print-failed-commands.sh
|
||||
ELOG := $(EXEC) sh $(MOZILLA_DIR)/build/unix/print-failed-commands.sh
|
||||
else
|
||||
ELOG :=
|
||||
endif # -s
|
||||
|
|
Загрузка…
Ссылка в новой задаче