From dfee5e5200efcfbc7f84287f46022d2cd63a15b9 Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Thu, 9 Apr 2015 00:46:33 +0300
Subject: Fix subproject again.

---
 interpreter.py                                       | 1 +
 test cases/common/80 shared subproject 2/meson.build | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/interpreter.py b/interpreter.py
index d140c19..75df340 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -1032,6 +1032,7 @@ class Interpreter():
         self.global_args_frozen = True
         mlog.log('\nExecuting subproject ', mlog.bold(dirname), '.\n', sep='')
         subi = Interpreter(self.build, dirname, subdir)
+        subi.subprojects = self.subprojects
 
         subi.subproject_stack = self.subproject_stack + [dirname]
         subi.run()
diff --git a/test cases/common/80 shared subproject 2/meson.build b/test cases/common/80 shared subproject 2/meson.build
index a0ce0f4..0647325 100644
--- a/test cases/common/80 shared subproject 2/meson.build	
+++ b/test cases/common/80 shared subproject 2/meson.build	
@@ -1,5 +1,8 @@
 project('A', 'c')
 
+# Same as the previous test but use C and B in
+# the opposite order.
+
 C = subproject('C')
 c = C.get_variable('c')
 
-- 
cgit v1.1