Skip linking if it's squawk, since newer gcc-none-eabi wants 'main' t…

…o be there, and it isn't. All we need in autosar is squawk.o.
sics-sse · Jun 15, 2017 · 5ae9590 · 5ae9590
1 parent 1948f59
commit 5ae9590
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/squawk/builder/src/com/sun/squawk/builder/commands/RomCommand.java b/squawk/builder/src/com/sun/squawk/builder/commands/RomCommand.java
@@ -531,8 +531,12 @@ public void run(String[] args) {
             env.log(env.brief, "[compiling '" + VM_SRC_FILE + "' ...]");
             objectFiles.add(ccompiler.compile(includeDirs, VM_SRC_FILE, VM_BLD_DIR, false));
 
-            env.log(env.brief, "[linking '" + bootstrapSuiteName + "' ...]");
-            ccompiler.link((File[])objectFiles.toArray(new File[objectFiles.size()]), bootstrapSuiteName, env.dll);
+	    if (!bootstrapSuiteName.equals("squawk")) {
+		env.log(env.brief, "[linking '" + bootstrapSuiteName + "' ...]");
+		ccompiler.link((File[])objectFiles.toArray(new File[objectFiles.size()]), bootstrapSuiteName, env.dll);
+	    } else {
+		env.log(env.brief, "[not linking squawk]");
+	    }
 
             if (!env.verbose) {
             	for (File file : generatedFiles) {