From 0941a99aa4ac45ebe4bea4705e4cd24aec156bf5 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sat, 18 Sep 2021 07:30:36 +0200
Subject: Fix spaces in CC, CXX and AR merging to one command...

---
 backend/ninja/Ninja.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'backend')

diff --git a/backend/ninja/Ninja.cpp b/backend/ninja/Ninja.cpp
index 0408ca4..f4beeb8 100644
--- a/backend/ninja/Ninja.cpp
+++ b/backend/ninja/Ninja.cpp
@@ -1010,8 +1010,8 @@ namespace backend
                     ninja::NinjaArg("-Wnon-virtual-dtor")
                 });
 
-                compileCCommand.insert(compileCCommand.begin(), ninja::NinjaArg(cCompilerName));
-                compileCppCommand.insert(compileCppCommand.begin(), ninja::NinjaArg(cppCompilerName));
+                compileCCommand.insert(compileCCommand.begin(), ninja::NinjaArg::createRaw(cCompilerName));
+                compileCppCommand.insert(compileCppCommand.begin(), ninja::NinjaArg::createRaw(cppCompilerName));
                 break;
             }
             case Compiler::MSVC:
@@ -1331,9 +1331,9 @@ namespace backend
                             case Compiler::GCC:
                             {
                                 if(usesCppFiles) {
-                                    buildExeArgs.push_back(ninja::NinjaArg(cppCompilerName));
+                                    buildExeArgs.push_back(ninja::NinjaArg::createRaw(cppCompilerName));
                                 } else {
-                                    buildExeArgs.push_back(ninja::NinjaArg(cCompilerName));
+                                    buildExeArgs.push_back(ninja::NinjaArg::createRaw(cCompilerName));
                                 }
                                 string rpath = extractDynamicLibDirsFromLinkerFlags(dynamicLinkerFlags);
                                 buildExeArgs.insert(buildExeArgs.end(), {
@@ -1384,7 +1384,7 @@ namespace backend
                             }
                             case Compiler::MSVC:
                             {
-                                buildExeArgs.push_back(ninja::NinjaArg(cppCompilerName));
+                                buildExeArgs.push_back(ninja::NinjaArg::createRaw(cppCompilerName));
                                 // TODO: Do not link all of these. Find a way to only link the ones that are needed
                                 buildExeArgs.insert(buildExeArgs.end(), {
                                     ninja::NinjaArg::createRaw("$in"),
@@ -1482,7 +1482,7 @@ namespace backend
                             case Compiler::MINGW_W64:
                             case Compiler::GCC:
                             {
-                                buildStaticArgs.push_back(ninja::NinjaArg(compilerLinker));
+                                buildStaticArgs.push_back(ninja::NinjaArg::createRaw(compilerLinker));
                                 buildStaticArgs.insert(buildStaticArgs.end(), {
                                     ninja::NinjaArg::createRaw("rcs"),
                                     ninja::NinjaArg::createRaw("$out"),
@@ -1492,7 +1492,7 @@ namespace backend
                             }
                             case Compiler::MSVC:
                             {
-                                buildStaticArgs.push_back(ninja::NinjaArg(compilerLinker));
+                                buildStaticArgs.push_back(ninja::NinjaArg::createRaw(compilerLinker));
                                 buildStaticArgs.insert(buildStaticArgs.end(), {
                                     ninja::NinjaArg::createRaw("/OUT:$out"),
                                     ninja::NinjaArg::createRaw("$in")
@@ -1571,9 +1571,9 @@ namespace backend
                             case Compiler::GCC:
                             {
                                 if(usesCppFiles) {
-                                    buildDynamicArgs.push_back(ninja::NinjaArg(cppCompilerName));
+                                    buildDynamicArgs.push_back(ninja::NinjaArg::createRaw(cppCompilerName));
                                 } else {
-                                    buildDynamicArgs.push_back(ninja::NinjaArg(cCompilerName));
+                                    buildDynamicArgs.push_back(ninja::NinjaArg::createRaw(cCompilerName));
                                 }
                                 buildDynamicArgs.insert(buildDynamicArgs.end(), {
                                     ninja::NinjaArg::createRaw("$in"), 
@@ -1616,7 +1616,7 @@ namespace backend
                             }
                             case Compiler::MSVC:
                             {
-                                buildDynamicArgs.push_back(ninja::NinjaArg(compilerLinker));
+                                buildDynamicArgs.push_back(ninja::NinjaArg::createRaw(compilerLinker));
                                 buildDynamicArgs.insert(buildDynamicArgs.end(), {
                                     ninja::NinjaArg::createRaw("/OUT:$out"),
                                     ninja::NinjaArg::createRaw("$in"),
-- 
cgit v1.2.3