Skip to content

Commit 8409f43

Browse files
authored
Merge pull request #3 from mathworks/dev_R2026a
Add support for SLRT/Speedgoat on R2026a.
2 parents bd75cd4 + fb5717c commit 8409f43

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

toolbox/+vcpkg/buildVcpkgDeps.m

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,20 @@ function buildVcpkgDeps(manifestFolder, vpckgArguments, options)
5454
end
5555
elseif contains(targetTriplet, 'x64-speedgoat-linux', 'IgnoreCase', true)
5656
% Yocto cc specific implementation
57-
x64CCRoot = getenv('X64CC_ROOT');
58-
if isempty(x64CCRoot)
57+
try
58+
hwConfigObj = slrealtime.internal.HardwareConfig.getHWConfigObject();
59+
x64CCPath = hwConfigObj.getToolchainPath('x64');
60+
catch ME
61+
error(message('slrealtime:utils:toolChainError', ME.message));
62+
end
63+
64+
if isempty(x64CCPath)
5965
%Error x64 cc root path not defined.
6066
error(message('slrealtime:utils:x64CCRootNotSet'));
6167
end
68+
6269
if ispc
63-
targetEnvRootBat = ['&& ',fullfile(x64CCRoot,'toolchain','x64cc-setup-env.bat')];
70+
targetEnvRootBat = ['&& ',fullfile(x64CCPath,'x64cc-setup-env.bat')];
6471
else
6572
error('Current host OS is still not supported.');
6673
end

0 commit comments

Comments
 (0)