Use priorities to determine the default toolchain

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 758d8b9b3a264d5f3905d9d18f10b033b7849e15..dbe40010c896680dfebbc6c0382f34fff06ad106 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -128,16 +128,6 @@ Architecture::Architecture(Builder &b, const string &spec):
                        native = true;
        }
 
-       if(toolchain.empty())
-       {
-               if((system=="darwin" || system=="freebsd") && builder.get_vfs().find_binary("clang"))
-                       toolchain = "clang";
-               else if(system=="windows" && native)
-                       toolchain = "msvc";
-               else
-                       toolchain = "gnu";
-       }
-
        update();
 }
 
@@ -154,7 +144,9 @@ void Architecture::update()
                name += format("-%s", cpu);
        if(!fpu.empty())
                name += format("-%s", fpu);
-       name += format("-%d-%s-%s", bits, system, toolchain);
+       name += format("-%d-%s", bits, system);
+       if(!toolchain.empty())
+               name += format("-%s", toolchain);
 
        filename_patterns.clear();
        if(system=="windows")