diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-05-23 18:49:51 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-05-23 18:49:51 -0400 |
| commit | de4e36570a29e079546977981b8f85e3afbbf62c (patch) | |
| tree | f6fa96de29836b075c417af6adb7645beeda47b8 | |
| parent | 614b1f2fe61ee36c8e6f8a1d60dbbe35af68e368 (diff) | |
| parent | 4df798f7b43249d9ed47dacc98312bf56e2d7d9f (diff) | |
| download | servo-de4e36570a29e079546977981b8f85e3afbbf62c.tar.gz servo-de4e36570a29e079546977981b8f85e3afbbf62c.zip | |
auto merge of #2472 : mbrubeck/servo/2137-done-deps, r=metajack
Part of the fix for #2137. This allows submodules to correctly recompile (or not) based on all of the dependency information from `mk/sub.mk`. Along with this change, we will also need to make changes to each of the affected submodules' make files, for example in `rust-azure/Makefile.in`:
```diff
-libazure.dummy: azure.rc $(RUST_SRC) libazure.a ../../skia/skia/libskia.a
+libazure.dummy: azure.rc $(RUST_SRC) libazure.a $(EXT_DEPS)
```
r? @metajack
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index b51ddf50642..4c532fbfbe4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -170,6 +170,7 @@ ENV_RLDFLAGS_$(1) += $$(foreach dep,$$(DEPS_$(1)),-L $$(B)src/$$(PATH_$$(dep)) - # variables that depend on dependency definitions from sub.mk! ENV_CFLAGS_$(1) = CFLAGS="$$(CFLAGS_$(1))" ENV_RFLAGS_$(1) = RUSTFLAGS="$$(strip $$(CFG_RUSTC_FLAGS)) $$(ENV_RLDFLAGS_$(1))" +ENV_EXT_DEPS_$(1) = EXT_DEPS="$$(DONE_DEPS_$(1))" # Native builds do not depend on the rust compiler, so we can build them in parallel with rustc RUSTC_DEP_$(1)= @@ -195,6 +196,7 @@ $$(DONE_$(1)) : $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1)) $$(RUSTC_DEP_$(1)) $$(ENV_CFLAGS_$(1)) \ $$(ENV_CXXFLAGS_$(1)) \ $$(ENV_RFLAGS_$(1)) \ + $$(ENV_EXT_DEPS_$(1)) \ $$(CROSS_COMPILER_CC) \ $$(CROSS_COMPILER_CXX) \ $$(CROSS_COMPILER_LD) \ |