From: pancake <pancake@youterm.com>
Date: Sun, 15 Nov 2009 22:49:45 +0000 (+0100)
Subject: valac: Do not check for an entry point when using C source files
X-Git-Tag: 0.7.9~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d1fa8e61ad9638c9120653c54c354f15f97e813e;p=thirdparty%2Fvala.git

valac: Do not check for an entry point when using C source files
---

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 4ce0744f9..11c35fce3 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -292,6 +292,8 @@ class Vala.Compiler {
 			return quit ();
 		}
 		
+		bool has_c_files = false;
+
 		foreach (string source in sources) {
 			if (FileUtils.test (source, FileTest.EXISTS)) {
 				var rpath = realpath (source);
@@ -315,6 +317,7 @@ class Vala.Compiler {
 					context.add_source_file (new SourceFile (context, rpath, true));
 				} else if (source.has_suffix (".c")) {
 					context.add_c_source_file (rpath);
+					has_c_files = true;
 				} else {
 					Report.error (null, "%s is not a supported source file type. Only .vala, .vapi, .gs, and .c files are supported.".printf (source));
 				}
@@ -359,7 +362,7 @@ class Vala.Compiler {
 
 		if (!ccode_only && !compile_only && library == null) {
 			// building program, require entry point
-			if (context.entry_point == null) {
+			if (!has_c_files && context.entry_point == null) {
 				Report.error (null, "program does not contain a static `main' method");
 			}
 		}