Fixed: Now using 2-steps parsing for environment

Author: MrcSnm

source/redub/buildapi.d

@@ -8,7 +8,7 @@ import redub.package_searching.api;
 
 
 ///vX.X.X
-enum RedubVersionOnly = "v1.23.3";
+enum RedubVersionOnly = "v1.23.4";
 ///Redub vX.X.X
 enum RedubVersionShort = "Redub "~RedubVersionOnly;
 ///Redub vX.X.X - Description

source/redub/parsers/automatic.d

@@ -82,13 +82,13 @@ BuildRequirements parseProject(
  */
 BuildRequirements postProcessBuildRequirements(BuildRequirements req, BuildConfiguration pending, CompilationInfo cInfo, bool isRoot, bool useExistingObj)
 {
-    redub.parsers.environment.setupEnvironmentVariablesForPackage(req.cfg);
     req.cfg.arch = cInfo.arch;
     req.extra.isRoot = isRoot;
     if(isRoot && useExistingObj)
         req.cfg.flags|= BuildConfigurationFlags.outputsDeps;
 
     partiallyFinishBuildRequirements(req, pending);    ///Merge need to happen after partial finish, since other configuration will be merged
+    req.cfg = redub.parsers.environment.parseEnvironment(req.cfg);
     return req;
 }
 

source/redub/parsers/environment.d

@@ -349,6 +349,7 @@ unittest
  */
 BuildConfiguration parseEnvironment(BuildConfiguration cfg)
 {
+    redub.parsers.environment.setupEnvironmentVariablesForPackage(cfg);
     with(cfg)
     {
         importDirectories = arrParseEnv(importDirectories);
@@ -378,10 +379,18 @@ string[] arrParseEnv(const string[] input)
 {
     if(input.length == 0)
         return null;
-    string[] ret = new string[](input.length);
+    string[] ret;
     foreach(i, str; input)
-        ret[i] = parseStringWithEnvironment(str);
-    return ret;
+    {
+        string temp = parseStringWithEnvironment(str);
+        if(temp != str)
+        {
+            if(ret is null)
+                ret = input.dup;
+            ret[i] = temp;
+        }
+    }
+    return ret is null ? cast(string[])input : ret;
 }
 
 /**