зеркало из https://github.com/mozilla/gecko-dev.git
Bug 517417 - access violation: while compiling xulrunner tries to test for Mercurial repositories above its build dir. r=ted
This commit is contained in:
Родитель
52cb1d3edc
Коммит
4742adb30e
|
@ -69,7 +69,7 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBX
|
||||||
|
|
||||||
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
|
DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
|
||||||
|
|
||||||
SOURCE_STAMP := $(shell cd $(topsrcdir) ; hg identify 2>/dev/null | cut -f1 -d' ')
|
SOURCE_STAMP := $(shell cd $(topsrcdir) ; hg identify . 2>/dev/null | cut -f1 -d' ')
|
||||||
ifdef SOURCE_STAMP
|
ifdef SOURCE_STAMP
|
||||||
DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)"
|
DEFINES += -DMOZ_SOURCE_STAMP="$(SOURCE_STAMP)"
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -58,7 +58,7 @@ DEFINES += \
|
||||||
-DCPPFLAGS="$(CPPFLAGS)" \
|
-DCPPFLAGS="$(CPPFLAGS)" \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
CHANGESET := $(shell cd $(topsrcdir) && hg identify 2>/dev/null | cut -f1 -d' ')
|
CHANGESET := $(shell cd $(topsrcdir) && hg identify . 2>/dev/null | cut -f1 -d' ')
|
||||||
ifdef CHANGESET
|
ifdef CHANGESET
|
||||||
DEFINES += -DSOURCE_CHANGESET="$(CHANGESET)"
|
DEFINES += -DSOURCE_CHANGESET="$(CHANGESET)"
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -220,7 +220,7 @@ DEFINES += -DHAVE_USR_LIB64_DIR
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SOURCE_STAMP := $(shell cd $(topsrcdir) && hg identify 2>/dev/null | cut -f1 -d' ')
|
SOURCE_STAMP := $(shell cd $(topsrcdir) && hg identify . 2>/dev/null | cut -f1 -d' ')
|
||||||
# strip a trailing slash from the repo URL because it's not always present,
|
# strip a trailing slash from the repo URL because it's not always present,
|
||||||
# and we want to construct a working URL in buildconfig.html
|
# and we want to construct a working URL in buildconfig.html
|
||||||
# make+shell+sed = awful
|
# make+shell+sed = awful
|
||||||
|
|
Загрузка…
Ссылка в новой задаче