Skip to content

Commit

Permalink
Change toolchain path to not require rtems/5 directory
Browse files Browse the repository at this point in the history
  • Loading branch information
eproxus committed Aug 24, 2021
1 parent 559f8c6 commit 3601c4a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/grisp_tools_build.erl
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ build(S0) ->
PATH = os:getenv("PATH"),
Env = #{
"GRISP_TC_ROOT" => ToolchainRoot,
"PATH" => filename:join(ToolchainRoot, "rtems/5/bin") ++ ":" ++ PATH
"PATH" => filename:join(ToolchainRoot, "bin") ++ ":" ++ PATH
},
mapz:deep_merge(S0, #{shell => #{env => Env}}).

Expand Down Expand Up @@ -202,7 +202,7 @@ post(#{build := #{hash := #{index := Index}}} = S0) ->
% info("Copying revision string into install dir"),
ToolchainRoot = mapz:deep_get([paths, toolchain], S0),
InstallPath = mapz:deep_get([paths, install], S0),
RevSource = filename:join([ToolchainRoot, "rtems/5", "GRISP_TOOLCHAIN_REVISION"]),
RevSource = filename:join([ToolchainRoot, "GRISP_TOOLCHAIN_REVISION"]),
RevDestination = filename:join(InstallPath, "GRISP_TOOLCHAIN_REVISION"),
case file:copy(RevSource, RevDestination) of
{ok, _} -> ok;
Expand Down

0 comments on commit 3601c4a

Please sign in to comment.