From 4df798f7b43249d9ed47dacc98312bf56e2d7d9f Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Wed, 21 May 2014 17:19:35 -0700 Subject: [PATCH] Pass external dependencies to submodule Makefiles Part of the fix for #2137. --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) 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) \