2 files changed, 22 insertions, 7 deletions
@@ -37,7 +37,8 @@ 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
@@ -47,6 +48,7 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 cmd = []
 cmd += [cargo, "rustc"]
 cmd += ["--target", ENV["CARGO_BUILD_TARGET"]] if ENV["CARGO_BUILD_TARGET"]
 cmd += ["--target-dir", dest_path]
 cmd += ["--manifest-path", manifest]
@@ -103,14 +105,23 @@ class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 # We want to use the same linker that Ruby uses, so that the linker flags from
 # mkmf work properly.
 def linker_args
- # Have to handle CC="cl /nologo" on mswin
 cc_flag = Shellwords.split(makefile_config("CC"))
 linker = cc_flag.shift
 link_args = cc_flag.flat_map {|a| ["-C", "link-arg=#{a}"] }
 ["-C", "linker=#{linker}", *link_args]
 end
 def libruby_args(dest_dir)
 libs = makefile_config(ruby_static? ? "LIBRUBYARG_STATIC" : "LIBRUBYARG_SHARED")
 raw_libs = Shellwords.split(libs)
@@ -3,20 +3,24 @@
 class Gem::Ext::CargoBuilder < Gem::Ext::Builder
 # Converts Ruby link flags into something cargo understands
 class LinkFlagConverter
 def self.convert(arg)
 case arg.chomp
 when /^-L\s*(.+)$/
 ["-L", "native=#{$1}"]
 when /^--library=(\w+\S+)$/, /^-l\s*(\w+\S+)$/
 ["-l", $1]
- when /^-l\s*:lib(\S+).a$/
- ["-l", "static=#{$1}"]
- when /^-l\s*:lib(\S+).(so|dylib|dll)$/
- ["-l", "dylib=#{$1}"]
 when /^-F\s*(.*)$/
 ["-l", "framework=#{$1}"]
 else
- ["-C", "link_arg=#{arg}"]
 end
 end
 end