Make warnings configurable through build_info and command line

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 8cff0dfe535b001fc8fa4f57289d87c0637798a6..d8142038d1e65756f5ad7ccae68f693dc86bf525 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -172,12 +172,9 @@ void SourcePackage::create_build_info()
                export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end());
        }
 
-       build_info.cflags.push_back("-Wall");
-       build_info.cflags.push_back("-Wshadow");
-       build_info.cflags.push_back("-Wextra");
-       build_info.cflags.push_back("-Wpointer-arith");
-       //build_info.cflags.push_back("-Wconversion");
-       build_info.cflags.push_back("-Werror");
+       // XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
+       const StringList &warnings=builder.get_warnings();
+       build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
 
        unsigned flags=get_install_flags();