From 10e99fa6f54251e00220720db61c078f9ea30af8 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 4 May 2016 13:08:59 -0400 Subject: [PATCH] P4 to Git Change 1265097 by smekhano@stas-rampitec-hsa on 2016/05/04 12:59:20 SWDEV-90709 - Complib: unquote command line arguments for -I and -D before passing to clang Testing: smoke, precheckin Reviewed by Evgeny Mankov Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.cpp#36 edit [ROCm/clr commit: 88638b2b491873c865c380ea2ab0a04f48d34358] --- projects/clr/rocclr/compiler/lib/utils/options.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/clr/rocclr/compiler/lib/utils/options.cpp b/projects/clr/rocclr/compiler/lib/utils/options.cpp index 671b167299..e8d7a892fa 100644 --- a/projects/clr/rocclr/compiler/lib/utils/options.cpp +++ b/projects/clr/rocclr/compiler/lib/utils/options.cpp @@ -1078,6 +1078,11 @@ parseAllOptions(std::string& options, Options& Opts, bool linkOptsOnly) return false; } std::string vStr = oStr.substr(vPos1, std::string::npos); + if ((vStr.size() > 2) && + (vStr.front() == '\"' && vStr.back() == '\"')) { + // Unquote string + vStr = vStr.substr(1, vStr.size() - 2); + } Opts.clangOptions.push_back(oStr.substr(0,2) + vStr); } }