1 files changed, 15 insertions, 0 deletions
diff --git a/tools/mhmake/src/mhmakefileparser.cpp b/tools/mhmake/src/mhmakefileparser.cpp
index 5236d58ee..8c75f78f7 100644
--- a/tools/mhmake/src/mhmakefileparser.cpp
+++ b/tools/mhmake/src/mhmakefileparser.cpp
@@ -918,6 +918,7 @@ bool mhmakefileparser::SkipHeaderFile(const string &FileName)
 ///////////////////////////////////////////////////////////////////////////////
 void mhmakefileparser::SetExport(const string &Var, const string &Val)
 {
+  m_Exports.insert(Var);
 #ifdef WIN32
   if (!m_pEnv)
   {
@@ -1170,6 +1171,20 @@ void mhmakefileparser::CreateUSED_ENVVARS()
     It++;
   }
 
+  It=m_Exports.begin();
+  ItEnd=m_Exports.end();
+
+  while (It!=ItEnd)
+  {
+    string Var=*It;
+    if (!SkipVar(Var))
+    {
+      transform(Var.begin(),Var.end(),Var.begin(),(int(__CDECL *)(int))toupper);
+      Variables.insert(Var);
+    }
+    It++;
+  }
+
   map<string,string>::const_iterator CLItEnd=loadedmakefile::sm_Statics.m_GlobalCommandLineVars.end();
   map<string,string>::const_iterator CLIt=loadedmakefile::sm_Statics.m_GlobalCommandLineVars.begin();
   while (CLIt!=CLItEnd)