Skip to content

Commit 7efa19e

Browse files
author
jantje
committed
Ignore all prebuild failures for ESP8266 #1547
1 parent d71c0ac commit 7efa19e

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

io.sloeber.core/src/io/sloeber/core/toolchain/ArduinoGnuMakefileGenerator.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,8 +1300,8 @@ private StringBuffer addTargets(List<String> outputVarsAdditionsList, boolean re
13001300
buffer.append(COMMENT_SYMBOL).append(WHITESPACE).append(ManagedMakeMessages.getResourceString(ALL_TARGET))
13011301
.append(NEWLINE);
13021302
buffer.append(defaultTarget).append(NEWLINE);
1303-
buffer.append(TAB).append(MAKE).append(WHITESPACE).append(NO_PRINT_DIR).append(WHITESPACE).append(PREBUILD)
1304-
.append(NEWLINE);
1303+
// the ||: is from here https://stackoverflow.com/questions/11871921/suppress-and-ignore-output-for-makefile
1304+
buffer.append(TAB).append(DASH).append(prebuildStep).append(" ||:").append(NEWLINE);
13051305
buffer.append(TAB).append(MAKE).append(WHITESPACE).append(NO_PRINT_DIR).append(WHITESPACE).append(MAINBUILD)
13061306
.append(NEWLINE);
13071307
buffer.append(NEWLINE);
@@ -1397,14 +1397,14 @@ private StringBuffer addTargets(List<String> outputVarsAdditionsList, boolean re
13971397
buffer.append(addTargetsRules(targetTool, outputVarsAdditionsList, managedProjectOutputs,
13981398
(postbuildStep.length() > 0)));
13991399
// Add the prebuild step target, if specified
1400-
if (prebuildStep.length() > 0) {
1401-
buffer.append(PREBUILD).append(COLON).append(NEWLINE);
1402-
if (preannouncebuildStep.length() > 0) {
1403-
buffer.append(TAB).append(DASH).append(AT).append(escapedEcho(preannouncebuildStep));
1404-
}
1405-
buffer.append(TAB).append(DASH).append(prebuildStep).append(NEWLINE);
1406-
buffer.append(TAB).append(DASH).append(AT).append(ECHO_BLANK_LINE).append(NEWLINE);
1407-
}
1400+
// if (prebuildStep.length() > 0) {
1401+
// buffer.append(PREBUILD).append(COLON).append(NEWLINE);
1402+
// if (preannouncebuildStep.length() > 0) {
1403+
// buffer.append(TAB).append(DASH).append(AT).append(escapedEcho(preannouncebuildStep));
1404+
// }
1405+
// buffer.append(TAB).append(DASH).append(prebuildStep).append(NEWLINE);
1406+
// buffer.append(TAB).append(DASH).append(AT).append(ECHO_BLANK_LINE).append(NEWLINE);
1407+
// }
14081408
// Add the postbuild step, if specified
14091409
if (postbuildStep.length() > 0) {
14101410
buffer.append(POSTBUILD).append(COLON).append(NEWLINE);

0 commit comments

Comments
 (0)