Skip to content

Commit

Permalink
(PA-5640) Fix ruybgem-ffi runtime logic
Browse files Browse the repository at this point in the history
Our logic is incorrect, previously we were looking at `settings[:runtime_project]`.
In agent-runtime context that will always just return 'agent', not the full project
name we were looking for.
This lead to having the PL build tools path added earlier then we want and an older
GCC being used that breaks rubygem-ffi from building.
  • Loading branch information
cthorn42 committed Jul 12, 2023
1 parent ae55412 commit bae6313
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configs/components/rubygem-ffi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
if platform.is_cross_compiled_linux?
pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH)"
elsif platform.is_solaris?
if settings[:runtime_project] == 'agent-runtime-main'
if settings[:ruby_version] =~ /3\.\d+\.\d+/
pkg.environment "PATH", "/opt/csw/bin:/opt/pl-build-tools/bin:$(PATH)"
else
pkg.environment "PATH", "/opt/pl-build-tools/bin:/opt/csw/bin:$(PATH)"
Expand Down

0 comments on commit bae6313

Please sign in to comment.