From 9523996b8a1d6f7a1aee8a1d905ec44331fa2436 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 20 Mar 2015 17:27:55 +0100
Subject: [PATCH] lib/libem.bash: bugfix in environment cleanup

---
 lib/libem.bash | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/libem.bash b/lib/libem.bash
index 88a08f6..35ac0e2 100644
--- a/lib/libem.bash
+++ b/lib/libem.bash
@@ -268,9 +268,11 @@ function _write_build_dependencies() {
 	done
 }
 
-# setup general environment
-function _setup_env1() {
-	local varname=''
+##############################################################################
+# 
+# cleanup environment
+#
+em.cleanup_env() {
 
 	C_INCLUDE_PATH=''
 	CPLUS_INCLUDE_PATH=''
@@ -284,7 +286,14 @@ function _setup_env1() {
 	CXXFLAGS=''
 	LIBS=''
 	LDFLAGS=''
-	
+}
+
+##############################################################################
+#
+# load default versions
+#
+ _setup_env1() {
+	local varname=''
 	while read _name _version; do
 		[[ -z ${_name} ]] && continue
 		[[ -z ${_version} ]] && continue
@@ -669,6 +678,8 @@ ENVIRONMENT_ARGS=''
 dry_run='no'
 bootstrap='no'
 
+em.cleanup_env
+
 # array collecting all modules specified on the command line via '--with=module'
 with_modules=()