mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-21 09:49:14 +00:00
Fix undesired tinderbox rebuilds due to system header wrapper timestamps changing. Bug 273336, r=dbaron.
This commit is contained in:
parent
d19eff04b7
commit
437a4837fa
@ -44,6 +44,10 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# For sanity's sake, we compile nsinstall without the wrapped system
|
||||
# headers, so that we can use it to set up the wrapped system headers.
|
||||
VISIBILITY_FLAGS =
|
||||
|
||||
ifneq (,$(CROSS_COMPILE)$(filter-out WINNT OS2,$(OS_ARCH)))
|
||||
HOST_PROGRAM = nsinstall$(HOST_BIN_SUFFIX)
|
||||
HOST_CSRCS = nsinstall.c pathsub.c
|
||||
@ -98,12 +102,6 @@ endif
|
||||
|
||||
HEADERS = nsBuildID.h $(DEPTH)/mozilla-config.h
|
||||
|
||||
ifdef WRAP_SYSTEM_INCLUDES
|
||||
export::
|
||||
mkdir -p $(DIST)/include/system_wrappers
|
||||
$(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl $(DIST)/include/system_wrappers < $(srcdir)/system-headers
|
||||
endif
|
||||
|
||||
export:: $(TARGETS) $(HEADERS)
|
||||
$(INSTALL) $(IFLAGS1) $(HEADERS) $(DIST)/include
|
||||
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(PUBLIC)/.headerlist $(HEADERS)
|
||||
@ -136,6 +134,13 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef WRAP_SYSTEM_INCLUDES
|
||||
export::
|
||||
if test ! -d system_wrappers; then mkdir system_wrappers; fi
|
||||
$(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers < $(srcdir)/system-headers
|
||||
$(INSTALL) system_wrappers $(DIST)/include
|
||||
endif
|
||||
|
||||
# we don't use an explicit dependency here because then we would
|
||||
# regenerate nsBuildID.h during the make install phase and that would
|
||||
# be bad.
|
||||
|
Loading…
x
Reference in New Issue
Block a user