From bae6313e723c1ea8f62129949489413187f778fa Mon Sep 17 00:00:00 2001 From: Christopher Thorn Date: Wed, 12 Jul 2023 06:34:34 -0700 Subject: [PATCH] (PA-5640) Fix ruybgem-ffi runtime logic 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. --- configs/components/rubygem-ffi.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/components/rubygem-ffi.rb b/configs/components/rubygem-ffi.rb index ab2772ddb..d6df15043 100644 --- a/configs/components/rubygem-ffi.rb +++ b/configs/components/rubygem-ffi.rb @@ -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)"