зеркало из https://github.com/mozilla/pjs.git
Pull uniq.pl along with modules.mk so that pulls of the standalone modules don't croak.
Bug #173066
This commit is contained in:
Родитель
d723ffcc21
Коммит
25f6745aca
10
client.mk
10
client.mk
|
@ -136,7 +136,7 @@ endif
|
||||||
# for how to set up mozconfig.
|
# for how to set up mozconfig.
|
||||||
MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
|
MOZCONFIG_LOADER := mozilla/build/autoconf/mozconfig2client-mk
|
||||||
MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find
|
MOZCONFIG_FINDER := mozilla/build/autoconf/mozconfig-find
|
||||||
MOZCONFIG_MODULES := mozilla/build/unix/modules.mk
|
MOZCONFIG_MODULES := mozilla/build/unix/modules.mk mozilla/build/unix/uniq.pl
|
||||||
run_for_side_effects := \
|
run_for_side_effects := \
|
||||||
$(shell cd $(ROOTDIR); \
|
$(shell cd $(ROOTDIR); \
|
||||||
if test "$(_IS_FIRST_CHECKOUT)"; then \
|
if test "$(_IS_FIRST_CHECKOUT)"; then \
|
||||||
|
@ -417,9 +417,9 @@ ifdef RUN_AUTOCONF_LOCALLY
|
||||||
mozilla/directory/c-sdk/configure
|
mozilla/directory/c-sdk/configure
|
||||||
endif
|
endif
|
||||||
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
|
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
|
||||||
@echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk mozilla/build/unix/modules.mk'; \
|
@echo '$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
|
||||||
cd $(ROOTDIR) && \
|
cd $(ROOTDIR) && \
|
||||||
$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk mozilla/build/unix/modules.mk
|
$(CVSCO) $(CVS_CO_DATE_FLAGS) mozilla/client.mk $(MOZCONFIG_MODULES)
|
||||||
@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
|
@cd $(ROOTDIR) && $(MAKE) -f mozilla/client.mk real_checkout
|
||||||
|
|
||||||
real_checkout:
|
real_checkout:
|
||||||
|
@ -471,9 +471,9 @@ ifdef RUN_AUTOCONF_LOCALLY
|
||||||
mozilla/directory/c-sdk/configure
|
mozilla/directory/c-sdk/configure
|
||||||
endif
|
endif
|
||||||
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
|
@echo "checkout start: "`date` | tee $(CVSCO_LOGFILE)
|
||||||
@echo '$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk'; \
|
@echo '$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)'; \
|
||||||
cd $(ROOTDIR) && \
|
cd $(ROOTDIR) && \
|
||||||
$(CVSCO) mozilla/client.mk mozilla/build/unix/modules.mk
|
$(CVSCO) mozilla/client.mk $(MOZCONFIG_MODULES)
|
||||||
@cd $(TOPSRCDIR) && \
|
@cd $(TOPSRCDIR) && \
|
||||||
$(MAKE) -f client.mk real_fast-update
|
$(MAKE) -f client.mk real_fast-update
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче