Skip to content

Commit 5ae9590

Browse files
committed
Skip linking if it's squawk, since newer gcc-none-eabi wants 'main' to be
there, and it isn't. All we need in autosar is squawk.o.
1 parent 1948f59 commit 5ae9590

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

squawk/builder/src/com/sun/squawk/builder/commands/RomCommand.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,12 @@ public void run(String[] args) {
531531
env.log(env.brief, "[compiling '" + VM_SRC_FILE + "' ...]");
532532
objectFiles.add(ccompiler.compile(includeDirs, VM_SRC_FILE, VM_BLD_DIR, false));
533533

534-
env.log(env.brief, "[linking '" + bootstrapSuiteName + "' ...]");
535-
ccompiler.link((File[])objectFiles.toArray(new File[objectFiles.size()]), bootstrapSuiteName, env.dll);
534+
if (!bootstrapSuiteName.equals("squawk")) {
535+
env.log(env.brief, "[linking '" + bootstrapSuiteName + "' ...]");
536+
ccompiler.link((File[])objectFiles.toArray(new File[objectFiles.size()]), bootstrapSuiteName, env.dll);
537+
} else {
538+
env.log(env.brief, "[not linking squawk]");
539+
}
536540

537541
if (!env.verbose) {
538542
for (File file : generatedFiles) {

0 commit comments

Comments
 (0)