diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-11-22 20:32:19 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2022-11-22 21:50:22 +0900 |
| commit | 14704023ec57546b1bed85d54f4f425986385ab4 (patch) | |
| tree | dbf1b3479c60dcb6a4bf71eb464b85a2ab080e54 /lib/rubygems | |
| parent | b102175b4dcfebe7455e3b27653fab0288f68326 (diff) | |
Merge RubyGems-3.3.26 and Bundler-2.3.26
Diffstat (limited to 'lib/rubygems')
| -rw-r--r-- | lib/rubygems/ext/cargo_builder.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/rubygems/ext/cargo_builder.rb b/lib/rubygems/ext/cargo_builder.rb index e33b07a8a2..24c1d3ae6e 100644 --- a/lib/rubygems/ext/cargo_builder.rb +++ b/lib/rubygems/ext/cargo_builder.rb @@ -37,6 +37,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder def build_env build_env = rb_config_env build_env["RUBY_STATIC"] = "true" if ruby_static? && ENV.key?("RUBY_STATIC") + build_env["RUSTFLAGS"] = "#{ENV["RUSTFLAGS"]} --cfg=rb_sys_gem".strip build_env end @@ -92,6 +93,9 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder # run on one that isn't the missing libraries will cause the extension # to fail on start. flags += ["-C", "link-arg=-static-libgcc"] + elsif darwin_target? + # Ventura does not always have this flag enabled + flags += ["-C", "link-arg=-Wl,-undefined,dynamic_lookup"] end flags |