Use a separate category for import library filename patterns

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index b186bb367cdb84350988f143142085c4b690a3ca..064b0a0f6e1faafc86d778c778afd4e6feae3573 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -221,6 +221,8 @@ Task *GnuCompiler::run(const Target &target) const
                {
                        argv.push_back("-Wextra");
                        argv.push_back("-Wundef");
+                       if(version>=0x80000)
+                               argv.push_back("-Wno-cast-function-type");
                }
                if(binfo.warning_level>=3)
                {
@@ -282,8 +284,7 @@ Task *GnuCompiler::run(const Target &target) const
        if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
                argv.push_back("-fPIC");
 
-       const Architecture &native_arch = builder.get_native_arch();
-       if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
+       if((architecture->get_type()=="x86" || architecture->get_type()=="ppc") && !architecture->is_native())
                argv.push_back(format("-m%d", architecture->get_bits()));
 
        string cpu = architecture->get_cpu();