From 5ae9590b51877680c8d4056bcdd5bb3aaff61d75 Mon Sep 17 00:00:00 2001 From: Arndt Jonasson Date: Thu, 15 Jun 2017 13:35:07 +0200 Subject: [PATCH] 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. --- .../src/com/sun/squawk/builder/commands/RomCommand.java | 8 ++++++-- 1 file changed, 6 insertions(+), 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 index 70bc5c2c..20582654 100644 --- 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) {