diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2014-05-21 17:19:35 -0700 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2014-05-21 17:22:31 -0700 |
| commit | 4df798f7b43249d9ed47dacc98312bf56e2d7d9f (patch) | |
| tree | c42433788248ee01524c7625b68f2b795a687874 | |
| parent | 28e3c1734048217cd2194ea37c887911ad03e894 (diff) | |
| download | servo-4df798f7b43249d9ed47dacc98312bf56e2d7d9f.tar.gz servo-4df798f7b43249d9ed47dacc98312bf56e2d7d9f.zip | |
Pass external dependencies to submodule Makefiles
Part of the fix for #2137.
| -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) \ |