Only use the -m flag on native arch

[builder.git] / source / gnucxxcompiler.cpp

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index fb7fbdce2cf37d0601f545e40c71d5c9528e0a5d..af001b3b569cfcd68e06dd67b5a4f16b4a6320af 100644 (file)
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,11 +1,14 @@
+#include <msp/fs/stat.h>
 #include "csourcefile.h"
 #include "gnucxxcompiler.h"
 
+using namespace std;
 using namespace Msp;
 
-GnuCxxCompiler::GnuCxxCompiler(Builder &b):
-       GnuCompiler(b, "CXX", "g++")
+GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
+       GnuCompiler(b, a, "CXX")
 {
+       set_command("g++", true);
        input_suffixes.push_back(".cpp");
        input_suffixes.push_back(".cc");
        aux_suffixes.push_back(".hpp");
@@ -15,3 +18,19 @@ Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &pat
 {
        return new CSourceFile(builder, comp, path);
 }
+
+Target *GnuCxxCompiler::create_source(const FS::Path &path) const
+{
+       return new CSourceFile(builder, path);
+}
+
+void GnuCxxCompiler::do_prepare()
+{
+       GnuCompiler::do_prepare();
+       if(!version.empty())
+       {
+               FS::Path cxx_path = FS::Path("/usr/include/c++")/version;
+               if(FS::is_dir(cxx_path))
+                       system_path.push_back(cxx_path);
+       }
+}