mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 1235676 - Add a global ABS_DIST variable for a non-relative version of DIST, based on topobjdir. r=mshal
This replaces multiple local definitions of ABS_DIST.
This commit is contained in:
parent
d7c74ef604
commit
2fcd7f7524
@ -11,6 +11,7 @@ DIST = dist
|
||||
else
|
||||
DIST = $(DEPTH)/dist
|
||||
endif
|
||||
ABS_DIST = $(topobjdir)/dist
|
||||
|
||||
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
|
||||
# manually use it before config.mk inclusion
|
||||
|
1
config/external/nspr/Makefile.in
vendored
1
config/external/nspr/Makefile.in
vendored
@ -8,7 +8,6 @@ include $(topsrcdir)/config/rules.mk
|
||||
ifdef MOZ_BUILD_NSPR
|
||||
|
||||
# Copy NSPR to the SDK
|
||||
ABS_DIST = $(abspath $(DIST))
|
||||
|
||||
ifdef MOZ_FOLD_LIBS
|
||||
# Trick the nspr build system into not building shared libraries.
|
||||
|
9
config/external/nss/Makefile.in
vendored
9
config/external/nss/Makefile.in
vendored
@ -85,15 +85,6 @@ NSS_EXTRA_DLLS += freebl_64int_3
|
||||
NSS_EXTRA_DLLS += freebl_64fpu_3
|
||||
endif
|
||||
|
||||
ABS_DIST := $(abspath $(DIST))
|
||||
ifeq ($(HOST_OS_ARCH),WINNT)
|
||||
ifdef CYGDRIVE_MOUNT
|
||||
ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\|/|g')
|
||||
endif
|
||||
ifneq (,$(filter mingw%,$(host_os)))
|
||||
ABS_DIST := $(shell cd $(DIST) && pwd -W)
|
||||
endif
|
||||
endif
|
||||
# For all variables such as DLLFLAGS, that may contain $(DIST)
|
||||
DIST := $(ABS_DIST)
|
||||
NSPR_INCLUDE_DIR = $(firstword $(filter -I%,$(NSPR_CFLAGS)))
|
||||
|
@ -116,7 +116,7 @@ endif # WINNT
|
||||
endif # MOZ_STATIC_JS
|
||||
MAKE_JSSHELL = $(call py_action,zip,-C $(DIST)/bin $(abspath $(PKG_JSSHELL)) $(JSSHELL_BINS))
|
||||
|
||||
_ABS_DIST = $(abspath $(DIST))
|
||||
_ABS_DIST = $(ABS_DIST)
|
||||
JARLOG_DIR = $(abspath $(DEPTH)/jarlog/)
|
||||
JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user