File tree Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Expand file tree Collapse file tree 1 file changed +3
-8
lines changed Original file line number Diff line number Diff line change 51
51
if defined? ( ::TruffleRuby )
52
52
# Always use the system libxml/libxslt for Nokogiri on TruffleRuby. This is
53
53
# currently required as TruffleRuby cannot yet link to static libraries.
54
+ # See https://github.com/sparklemotion/nokogiri/pull/2085 when solving this.
54
55
ENV [ 'NOKOGIRI_USE_SYSTEM_LIBRARIES' ] = 'true'
55
56
end
56
57
@@ -575,14 +576,8 @@ def cc_command(opt="")
575
576
conf = RbConfig ::CONFIG . merge ( 'hdrdir' => $hdrdir. quote , 'srcdir' => $srcdir. quote ,
576
577
'arch_hdrdir' => $arch_hdrdir. quote ,
577
578
'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 )
586
581
end
587
582
588
583
def cpp_command ( outfile , opt = "" )
You can’t perform that action at this time.
0 commit comments