From ff5b9f666073b37758ae0193f24d2cdb0ff6343d Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 28 Dec 2016 20:31:52 +0100 Subject: [PATCH] Consider sketchbook and bundled libraries folders only if they exists --- arduino-core/src/cc/arduino/Compiler.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arduino-core/src/cc/arduino/Compiler.java b/arduino-core/src/cc/arduino/Compiler.java index ddd0fad52..b5118fa1e 100644 --- a/arduino-core/src/cc/arduino/Compiler.java +++ b/arduino-core/src/cc/arduino/Compiler.java @@ -237,10 +237,8 @@ public class Compiler implements MessageConsumer { addPathFlagIfPathExists(cmd, "-tools", Paths.get(BaseNoGui.getHardwarePath(), "tools", "avr").toFile()); addPathFlagIfPathExists(cmd, "-tools", installedPackagesFolder); - cmd.add("-built-in-libraries"); - cmd.add(BaseNoGui.getContentFile("libraries").getAbsolutePath()); - cmd.add("-libraries"); - cmd.add(BaseNoGui.getSketchbookLibrariesFolder().getAbsolutePath()); + addPathFlagIfPathExists(cmd, "-built-in-libraries", BaseNoGui.getContentFile("libraries")); + addPathFlagIfPathExists(cmd, "-libraries", BaseNoGui.getSketchbookLibrariesFolder()); String fqbn = Stream.of(aPackage.getId(), platform.getId(), board.getId(), boardOptions(board)).filter(s -> !s.isEmpty()).collect(Collectors.joining(":")); cmd.add("-fqbn=" + fqbn);