Skip to content

Commit 2f4e982

Browse files
author
jantje
committed
#1446 add tool references from referenced platforms for private hardware
1 parent 9f86244 commit 2f4e982

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

io.sloeber.core/src/io/sloeber/core/api/BoardDescription.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,18 @@ public Map<String, String> getEnvVars() {
851851

852852
private Map<String, String> getEnVarPlatformInfo() {
853853
Map<String, String> ret = new HashMap<>();
854+
855+
if (myReferencedPlatformUpload != null) {
856+
ret.putAll(getEnvVarPlatformFileTools(myReferencedPlatformUpload));
857+
}
858+
if (myReferencedPlatformVariant != null) {
859+
ret.putAll(getEnvVarPlatformFileTools(myReferencedPlatformVariant));
860+
}
861+
862+
if (myReferencedPlatformCore != null) {
863+
ret.putAll(getEnvVarPlatformFileTools(myReferencedPlatformCore));
864+
}
865+
854866
IPath referencingPlatformPath = getreferencingPlatformPath();
855867
ArduinoPlatformVersion referencingPlatform = BoardsManager.getPlatform(referencingPlatformPath);
856868

@@ -874,7 +886,6 @@ private Map<String, String> getEnVarPlatformInfo() {
874886
boolean jsonBasedPlatformManagement = !Preferences.getUseArduinoToolSelection();
875887
if (jsonBasedPlatformManagement) {
876888
// overrule the Arduino IDE way of working and use the json refereced tools
877-
ret.putAll(getEnvVarPlatformFileTools(myReferencedPlatformCore));
878889
ret.putAll(getEnvVarPlatformFileTools(referencingPlatform));
879890
return ret;
880891
}

0 commit comments

Comments
 (0)