From 0527f4eef35b56afd67c65382a0e395d86db93f4 Mon Sep 17 00:00:00 2001 From: Jonathan M Davis Date: Sat, 24 Feb 2018 02:59:54 -0700 Subject: [PATCH] issue 18515: Fix it so that neither g++ nor CC is required. It was previously fixed so that cc is used if CC isn't set when compiling dmd, but the test suite still had g++ hardcoded, so if the system was set up with clang and not gcc, the dmd test suite barfed midway through. This fixes it so that it uses c++ if CC isn't set instead of using g++. --- test/d_do_test.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/d_do_test.d b/test/d_do_test.d index c7a5d2cf1153..7276a540628c 100755 --- a/test/d_do_test.d +++ b/test/d_do_test.d @@ -569,7 +569,7 @@ int tryMain(string[] args) { case "win32": envData.ccompiler = "dmc"; break; case "win64": envData.ccompiler = `\"Program Files (x86)"\"Microsoft Visual Studio 10.0"\VC\bin\amd64\cl.exe`; break; - default: envData.ccompiler = "g++"; break; + default: envData.ccompiler = "c++"; break; } } bool msc = envData.ccompiler.toLower.endsWith("cl.exe");