[vala] valac: Do not check for an entry point when using C source files
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vala] valac: Do not check for an entry point when using C source files
- Date: Sun, 15 Nov 2009 22:51:41 +0000 (UTC)
commit d1fa8e61ad9638c9120653c54c354f15f97e813e
Author: pancake <pancake youterm com>
Date: Sun Nov 15 23:49:45 2009 +0100
valac: Do not check for an entry point when using C source files
compiler/valacompiler.vala | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index 4ce0744..11c35fc 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");
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]