From 7ef5ec77df1f0cfd8133c00b97c1b5c416d9a5e6 Mon Sep 17 00:00:00 2001 From: "Victor \"Nate\" Graf" Date: Fri, 11 Aug 2017 15:10:29 -0700 Subject: [PATCH] Fix bug where whitespace breaks arg proccessing (#13320) * Fix bug where whitespace breaks arg proccessing * Fix whitespace proccessing bug in buil-text.cmd --- build-test.cmd | 7 +++++-- build.cmd | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build-test.cmd b/build-test.cmd index bf17827..df7df44 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -86,9 +86,12 @@ if /i "%1" == "targetsNonWindows" (set __TargetsWindows=0&set processedArgs= if /i "%1" == "Exclude" (set __Exclude=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if [!processedArgs!]==[] ( - call set __UnprocessedBuildArgs=!__args! + set __UnprocessedBuildArgs=%__args% ) else ( - call set __UnprocessedBuildArgs=%%__args:*!processedArgs!=%% + set __UnprocessedBuildArgs=%__args% + for %%t in (!processedArgs!) do ( + set __UnprocessedBuildArgs=!__UnprocessedBuildArgs:*%%t=! + ) ) :ArgsDone diff --git a/build.cmd b/build.cmd index d48042a..aa24f39 100644 --- a/build.cmd +++ b/build.cmd @@ -155,9 +155,12 @@ if /i "%1" == "buildstandalonegc" ( if /i "%1" == "altjitcrossgen" (set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if [!processedArgs!]==[] ( - call set __UnprocessedBuildArgs=!__args! + set __UnprocessedBuildArgs=%__args% ) else ( - call set __UnprocessedBuildArgs=%%__args:*!processedArgs!=%% + set __UnprocessedBuildArgs=%__args% + for %%t in (!processedArgs!) do ( + set __UnprocessedBuildArgs=!__UnprocessedBuildArgs:*%%t=! + ) ) :ArgsDone -- 2.7.4