Skip to content

Commit 90231f5

Browse files
committed
fix for #272 should fix #274
1 parent 3d558d2 commit 90231f5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ArduinoHelpers.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ private static void setTheEnvironmentVariablesSetTheDefaults(IContributedEnviron
516516
}
517517
String buildVariantPath = makeEnvironmentVar(ENV_KEY_PLATFORM_PATH) + "/variants/" + makeEnvironmentVar(ArduinoConst.ENV_KEY_build_variant);
518518

519-
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_ARCHITECTURE, makeEnvironmentVar(ENV_KEY_JANTJE_ARCITECTURE_ID));
520-
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_ARCH, makeEnvironmentVar(ENV_KEY_JANTJE_ARCITECTURE_ID));
519+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_ARCHITECTURE, architecture.toUpperCase());
520+
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_BUILD_ARCH, architecture.toUpperCase());
521521
// from 1.6.2 the hardware path can also contain a version number
522522
// TOFIX test with boardmanager and without board manager
523523
Common.setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_HARDWARE_PATH, platformFile.removeLastSegments(3).toString());
@@ -769,6 +769,7 @@ public static void setTheEnvironmentVariables(IProject project, ICConfigurationD
769769
String packageName = Common.getBuildEnvironmentVariable(confDesc, ArduinoConst.ENV_KEY_JANTJE_PACKAGE_ID, "");
770770
File anduinoIDEEnvNamesFile = Common.getArduinoIdeDumpName(packageName, architecture, boardID);
771771
IPath anduinoIDEEnvNamesPath = new Path(anduinoIDEEnvNamesFile.toString());
772+
architecture = architecture.toUpperCase();
772773

773774
// first remove all Arduino Variables so there is no memory effect
774775
RemoveAllArduinoEnvironmentVariables(contribEnv, confDesc);

it.baeyens.arduino.core/src/it/baeyens/arduino/ui/ArduinoSelectionPage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ public String getArchitecture() {
497497
if (architecture.contains(".")) {
498498
architecture = platformFile.removeLastSegments(2).lastSegment();
499499
}
500-
return architecture.toUpperCase();
500+
return architecture;
501501
}
502502

503503
public String getBoardID() {

0 commit comments

Comments
 (0)