Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2472 : mbrubeck/servo/2137-done-deps, r=metajack

Browse source 
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
This commit is contained in:
bors-servo 2014-05-23 18:49:51 -04:00
commit de4e36570a
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -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! # variables that depend on dependency definitions from sub.mk!
ENV_CFLAGS_$(1) = CFLAGS="$$(CFLAGS_$(1))" ENV_CFLAGS_$(1) = CFLAGS="$$(CFLAGS_$(1))"
ENV_RFLAGS_$(1) = RUSTFLAGS="$$(strip $$(CFG_RUSTC_FLAGS)) $$(ENV_RLDFLAGS_$(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 # Native builds do not depend on the rust compiler, so we can build them in parallel with rustc
RUSTC_DEP_$(1)= RUSTC_DEP_$(1)=
@ -195,6 +196,7 @@ $$(DONE_$(1)) : $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1)) $$(RUSTC_DEP_$(1))
$$(ENV_CFLAGS_$(1)) \ $$(ENV_CFLAGS_$(1)) \
$$(ENV_CXXFLAGS_$(1)) \ $$(ENV_CXXFLAGS_$(1)) \
$$(ENV_RFLAGS_$(1)) \ $$(ENV_RFLAGS_$(1)) \
$$(ENV_EXT_DEPS_$(1)) \
$$(CROSS_COMPILER_CC) \ $$(CROSS_COMPILER_CC) \
$$(CROSS_COMPILER_CXX) \ $$(CROSS_COMPILER_CXX) \
$$(CROSS_COMPILER_LD) \ $$(CROSS_COMPILER_LD) \