diff --git a/scripts/waflib/subproject.py b/scripts/waflib/subproject.py
index c629a6eb..c09ed74d 100644
--- a/scripts/waflib/subproject.py
+++ b/scripts/waflib/subproject.py
@@ -123,5 +123,7 @@ def add_subproject(ctx, names):
 		for name in names_lst:
 			if name in IGNORED_SUBDIRS:
 				return
+			saveenv = ctx.env
 			ctx.env = ctx.all_envs[name]
-			ctx.recurse(name)		
+			ctx.recurse(name)
+			ctx.env = saveenv