зеркало из https://github.com/mozilla/pjs.git
If MOZ_OBJDIR is set, automagically determine the relative path from the objdir to the srcdir and pass --srcdir to configure using this relative path. This is needed to workaround the issue with absolute paths in the win32 gmake build.
Bug #135589 r=bryner a=rjesup
This commit is contained in:
Родитель
ac14ac5b17
Коммит
c3ef34738b
17
client.mk
17
client.mk
|
@ -362,6 +362,15 @@ CHECKOUT_CALENDAR := true
|
||||||
FASTUPDATE_CALENDAR := true
|
FASTUPDATE_CALENDAR := true
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
# because some cygwin tools can't handle native dos-drive paths & vice-versa
|
||||||
|
# force configure to use a relative path for --srcdir
|
||||||
|
# need a better check for win32
|
||||||
|
# and we need to get OBJDIR earlier
|
||||||
|
ifdef MOZ_TOOLS
|
||||||
|
_OBJ2SRCPATH := $(shell perl -e 'use File::Spec::Unix; print File::Spec::Unix->abs2rel("$(TOPSRCDIR)","$(shell cygpath -u $(OBJDIR))");')
|
||||||
|
endif
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Rules
|
# Rules
|
||||||
#
|
#
|
||||||
|
@ -579,11 +588,15 @@ else
|
||||||
CONFIGURE := $(TOPSRCDIR)/configure
|
CONFIGURE := $(TOPSRCDIR)/configure
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef _OBJ2SRCPATH
|
||||||
|
CONFIGURE_ARGS := --srcdir=$(_OBJ2SRCPATH) $(CONFIGURE_ARGS)
|
||||||
|
endif
|
||||||
|
|
||||||
$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
|
$(OBJDIR)/Makefile $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
|
||||||
@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
|
@if test ! -d $(OBJDIR); then $(MKDIR) $(OBJDIR); else true; fi
|
||||||
@echo cd $(OBJDIR);
|
@echo cd $(OBJDIR);
|
||||||
@echo $(CONFIGURE)
|
@echo $(CONFIGURE) $(CONFIGURE_ARGS)
|
||||||
@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) \
|
@cd $(OBJDIR) && $(CONFIGURE_ENV_ARGS) $(CONFIGURE) $(CONFIGURE_ARGS) \
|
||||||
|| ( echo "*** Fix above errors and then restart with\
|
|| ( echo "*** Fix above errors and then restart with\
|
||||||
\"$(MAKE) -f client.mk build\"" && exit 1 )
|
\"$(MAKE) -f client.mk build\"" && exit 1 )
|
||||||
@touch $(OBJDIR)/Makefile
|
@touch $(OBJDIR)/Makefile
|
||||||
|
|
Загрузка…
Ссылка в новой задаче