author | Gregory Szorc <gps@mozilla.com> |
Mon, 22 Aug 2011 18:34:01 +0100 | |
changeset 75664 | 1ee70d6bb2c8ce742aa6171b00d0c765537e7597 |
parent 75663 | 4ce563287cd132e1fef5c162a7d3892a509d22a0 |
child 75665 | 452d6e41403297b509498d364e3cf01aead59497 |
push id | 21051 |
push user | mlamouri@mozilla.com |
push date | Tue, 23 Aug 2011 08:20:16 +0000 |
treeherder | mozilla-central@a41b781330a6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | khuey |
bugs | 680534 |
milestone | 9.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/config/rules.mk +++ b/config/rules.mk @@ -1545,19 +1545,16 @@ ifeq ($(XPIDL_MODULE),) # we need $(XPID export:: FORCE @echo @echo "*** Error processing XPIDLSRCS:" @echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS," @echo "so we have a module name to use when creating MODULE.xpt." @echo; sleep 2; false endif -$(IDL_DIR):: - $(NSINSTALL) -D $@ - # generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include; # warn against overriding existing .h file. $(XPIDL_GEN_DIR)/.done: $(MKDIR) -p $(XPIDL_GEN_DIR) @$(TOUCH) $@ # don't depend on $(XPIDL_GEN_DIR), because the modification date changes # with any addition to the directory, regenerating all .h files -> everything. @@ -1618,24 +1615,18 @@ export:: $(XPIDLSRCS) $(IDL_DIR) export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(DIST)/include $(INSTALL) $(IFLAGS1) $^ endif # NO_DIST_INSTALL endif # XPIDLSRCS -# # General rules for exporting idl files. -# -# WORK-AROUND ONLY, for mozilla/tools/module-deps/bootstrap.pl build. -# Bug to fix idl dependency problems w/o this extra build pass is -# http://bugzilla.mozilla.org/show_bug.cgi?id=145777 -# -$(IDL_DIR):: +$(IDL_DIR): $(NSINSTALL) -D $@ export-idl:: $(SUBMAKEFILES) $(MAKE_DIRS) ifneq ($(XPIDLSRCS),) ifndef NO_DIST_INSTALL export-idl:: $(XPIDLSRCS) $(IDL_DIR) $(INSTALL) $(IFLAGS1) $^
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1545,19 +1545,16 @@ ifeq ($(XPIDL_MODULE),) # we need $(XPID export:: FORCE @echo @echo "*** Error processing XPIDLSRCS:" @echo "Please define MODULE or XPIDL_MODULE when defining XPIDLSRCS," @echo "so we have a module name to use when creating MODULE.xpt." @echo; sleep 2; false endif -$(IDL_DIR):: - $(NSINSTALL) -D $@ - # generate .h files from into $(XPIDL_GEN_DIR), then export to $(DIST)/include; # warn against overriding existing .h file. $(XPIDL_GEN_DIR)/.done: $(MKDIR) -p $(XPIDL_GEN_DIR) @$(TOUCH) $@ # don't depend on $(XPIDL_GEN_DIR), because the modification date changes # with any addition to the directory, regenerating all .h files -> everything. @@ -1618,24 +1615,18 @@ export:: $(XPIDLSRCS) $(IDL_DIR) export:: $(patsubst %.idl,$(XPIDL_GEN_DIR)/%.h, $(XPIDLSRCS)) $(DIST)/include $(INSTALL) $(IFLAGS1) $^ endif # NO_DIST_INSTALL endif # XPIDLSRCS -# # General rules for exporting idl files. -# -# WORK-AROUND ONLY, for mozilla/tools/module-deps/bootstrap.pl build. -# Bug to fix idl dependency problems w/o this extra build pass is -# http://bugzilla.mozilla.org/show_bug.cgi?id=145777 -# -$(IDL_DIR):: +$(IDL_DIR): $(NSINSTALL) -D $@ export-idl:: $(SUBMAKEFILES) $(MAKE_DIRS) ifneq ($(XPIDLSRCS),) ifndef NO_DIST_INSTALL export-idl:: $(XPIDLSRCS) $(IDL_DIR) $(INSTALL) $(IFLAGS1) $^