Skip to content

Commit 2c8f348

Browse files
author
jantje
committed
#1147 same workaround as in arduino cli
1 parent ee14fbf commit 2c8f348

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

io.sloeber.core/config/post_processing_boards_default.txt

-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
mega.compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax
2-
megaADK.compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections,--relax
3-
4-
5-
61

72
#workaround for maxim to avoid double quotes
83
max32620_fthr.build.usbLib=-Ddefined_in_post_processing_boards_txt

io.sloeber.core/src/io/sloeber/core/common/Const.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,18 @@ public class Const {
4848
public static final String ARDUINO_VARIANT_FOLDER_PATH =ARDUINO_CODE_FOLDER_NAME+ "/variant";
4949

5050
// tags to interpret the arduino txt config files
51-
51+
public static final String ENV_KEY_JANTJE_START = "JANTJE.";
5252
public static final String ERASE_START = "A" + DOT;
5353

5454
public static final String ENV_KEY_UPLOAD_USE_1200BPS_TOUCH = ERASE_START + "UPLOAD.USE_1200BPS_TOUCH";
55-
5655
public static final String ENV_KEY_WAIT_FOR_UPLOAD_PORT = ERASE_START + "UPLOAD.WAIT_FOR_UPLOAD_PORT";
5756
public static final String ENV_KEY_RESET_BEFORE_UPLOAD = ERASE_START + "UPLOAD.FORCE_RESET_BEFORE_UPLOAD";
5857
public static final String ENV_KEY_NETWORK_PORT = ERASE_START + "NETWORK.PORT";
5958
public static final String ENV_KEY_NETWORK_AUTH = ERASE_START + "NETWORK.AUTH";
60-
61-
public static final String ENV_KEY_USE_ARCHIVER = ERASE_START + "BUILD.USE_ARCHIVER";
62-
63-
public static final String ENV_KEY_JANTJE_START = "JANTJE.";
59+
public static final String ENV_KEY_USE_ARCHIVER = ERASE_START + "BUILD.USE_ARCHIVER";
60+
public static final String ENV_KEY_BUILD_MCU = ERASE_START + "BUILD.MCU";
61+
public static final String ENV_KEY_BUILD_COMPILER_C_ELF_FLAGS = ERASE_START + "COMPILER.C.ELF.FLAGS";
6462

6563
public static final String ARDUINO_NATURE_ID = "io.sloeber.arduinonature";
66-
64+
6765
}

io.sloeber.core/src/io/sloeber/core/tools/Helpers.java

+6
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,12 @@ else if("A.BUILD.USB_PRODUCT".equalsIgnoreCase(name)){
944944
setHookBuildEnvironmentVariable(contribEnv, confDesc, "A.JANTJE.SKETCH.POSTBUILD","A.RECIPE.HOOKS.SKETCH.POSTBUILD.XX.PATTERN",false);
945945

946946

947+
//add -relax for mega boards
948+
String buildMCU =getBuildEnvironmentVariable(confDesc, Const.ENV_KEY_BUILD_MCU, new String(), false);
949+
if ("atmega2560".equalsIgnoreCase(buildMCU)){
950+
String c_elf_flags =getBuildEnvironmentVariable(confDesc, Const.ENV_KEY_BUILD_COMPILER_C_ELF_FLAGS, new String(), false);
951+
setBuildEnvironmentVariable(confDesc, Const.ENV_KEY_BUILD_COMPILER_C_ELF_FLAGS, c_elf_flags +",--relax");
952+
}
947953
}
948954

949955

0 commit comments

Comments
 (0)