Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ public static List<String> getCompileArgs(WFile rootPath, boolean forBuild, Stri
.filter(s -> s.startsWith("-") || (forBuild && s.startsWith("+")))
.map(s -> forBuild && s.startsWith("+") ? "-" + s.substring(1) : s)
.collect(Collectors.toList()));
if (forBuild) {
addBuildDefault(args, "-opt");
addBuildDefault(args, "-inline");
addBuildDefault(args, "-localOptimizations");
}
args.addAll(List.of(additionalArgs));
return WurstBuildConfig.fromWorkspaceRoot(rootPath).applyToCompileArgs(args);
}
Expand All @@ -166,10 +161,4 @@ public static List<String> getCompileArgs(WFile rootPath, boolean forBuild, Stri
}
}

private static void addBuildDefault(List<String> args, String option) {
if (!args.contains(option)) {
args.add(option);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void buildOnlyRunArgsAreExcludedFromRunAndEnabledForBuild() throws Except
assertTrue(buildArgs.contains("-stacktraces"));
assertTrue(buildArgs.contains("-inline"));
assertTrue(buildArgs.contains("-localOptimizations"));
assertTrue(buildArgs.contains("-opt"), "builds enable output optimization by default");
assertFalse(buildArgs.contains("-opt"), "build options require their corresponding '+' entry");
}

@Test
Expand Down
Loading