mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 15:23:51 +00:00
Bug 1669633 - Remove MOZ_BUILD_ROOT. r=firefox-build-system-reviewers,andi,rstewart
It is only really used in js/src/devtools/rootAnalysis/Makefile.in, and even there, the way it is used seems wrong, so fix that at the same time (binaries have been linked into $DIST/bin directly for a while). Differential Revision: https://phabricator.services.mozilla.com/D92721
This commit is contained in:
parent
10fe4d2d97
commit
cd3a2d5a79
@ -115,15 +115,12 @@ def check_build_environment(help, dist):
|
||||
|
||||
set_config('TOPSRCDIR', check_build_environment.topsrcdir)
|
||||
set_config('TOPOBJDIR', check_build_environment.topobjdir)
|
||||
set_config('MOZ_BUILD_ROOT', check_build_environment.topobjdir)
|
||||
set_config('DIST', check_build_environment.dist)
|
||||
|
||||
add_old_configure_assignment(
|
||||
'_topsrcdir', check_build_environment.topsrcdir)
|
||||
add_old_configure_assignment(
|
||||
'_objdir', check_build_environment.topobjdir)
|
||||
add_old_configure_assignment(
|
||||
'MOZ_BUILD_ROOT', check_build_environment.topobjdir)
|
||||
add_old_configure_assignment(
|
||||
'DIST', check_build_environment.dist)
|
||||
|
||||
|
@ -61,7 +61,6 @@ showbuild showhost: _DEPEND_CFLAGS=
|
||||
showbuild showhost: COMPILE_PDB_FLAG=
|
||||
showbuild:
|
||||
$(call print_vars,\
|
||||
MOZ_BUILD_ROOT \
|
||||
MOZ_WIDGET_TOOLKIT \
|
||||
CC \
|
||||
CXX \
|
||||
|
@ -15,11 +15,11 @@
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# Tree to build and analyze, defaulting to the current tree
|
||||
TARGET_JSOBJDIR ?= $(MOZ_BUILD_ROOT)
|
||||
TARGET_JSOBJDIR ?= $(TOPOBJDIR)
|
||||
|
||||
# Path to a JS binary to use to run the analysis. You really want this to be an
|
||||
# optimized build.
|
||||
JS ?= $(MOZ_BUILD_ROOT)/shell/js
|
||||
JS ?= $(DIST)/bin/js
|
||||
|
||||
# Path to an xgill checkout containing the GCC plugin, xdb-processing binaries,
|
||||
# and compiler wrapper scripts used to automatically integrate into an existing
|
||||
|
Loading…
Reference in New Issue
Block a user