mirror of https://github.com/noisymime/Arduino.git
Compiler: merge sketch must look for the bootloader file under runtime.platform.path, not build.platform.path. Fixes #3395
This commit is contained in:
parent
7f2fc71607
commit
5d3e4c185e
|
@ -1203,7 +1203,7 @@ public class Compiler implements MessageConsumer {
|
||||||
bootloaderNoBlink = prefs.get("bootloader.file");
|
bootloaderNoBlink = prefs.get("bootloader.file");
|
||||||
}
|
}
|
||||||
|
|
||||||
File bootloader = new File(new File(prefs.get("build.platform.path"), "bootloaders"), bootloaderNoBlink);
|
File bootloader = new File(new File(prefs.get("runtime.platform.path"), "bootloaders"), bootloaderNoBlink);
|
||||||
if (!bootloader.exists()) {
|
if (!bootloader.exists()) {
|
||||||
System.err.println(I18n.format(_("Bootloader file specified but missing: {0}"), bootloader));
|
System.err.println(I18n.format(_("Bootloader file specified but missing: {0}"), bootloader));
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue