Skip to content

Commit 6f66e81

Browse files
committed
[GR-17457] Remove no longer needed change in mkmf.rb
PullRequest: truffleruby/2010
2 parents 8e43efb + b025ee4 commit 6f66e81

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

lib/mri/mkmf.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
if defined?(::TruffleRuby)
5252
# Always use the system libxml/libxslt for Nokogiri on TruffleRuby. This is
5353
# currently required as TruffleRuby cannot yet link to static libraries.
54+
# See https://github.com/sparklemotion/nokogiri/pull/2085 when solving this.
5455
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] = 'true'
5556
end
5657

@@ -575,14 +576,8 @@ def cc_command(opt="")
575576
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'srcdir' => $srcdir.quote,
576577
'arch_hdrdir' => $arch_hdrdir.quote,
577578
'top_srcdir' => $top_srcdir.quote)
578-
if defined?(::TruffleRuby)
579-
# Specify output file (-o) explictly. Clang 3.8 produces conftest.o and 3.9 conftest.bc.
580-
RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -o #{CONFTEST}.#{$OBJEXT} -c #{CONFTEST_C}",
581-
conf)
582-
else
583-
RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
584-
conf)
585-
end
579+
RbConfig::expand("$(CC) #$INCFLAGS #$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} -c #{CONFTEST_C}",
580+
conf)
586581
end
587582

588583
def cpp_command(outfile, opt="")

0 commit comments

Comments
 (0)