Fixes for linker.

Author: aardvark179

lib/cext/preprocess.rb

@@ -13,7 +13,7 @@
 
   file_name = ARGV.first
   original_content = File.read(file_name)
-  output = Truffle::CEXt::Preprocessor.patch(file_name, original_content, Dir.pwd)
+  output = Truffle::CExt::Preprocessor.patch(file_name, original_content, Dir.pwd)
 
   if ENV['PREPROCESS_DEBUG'] && original_content != output
     patched_file_name = "#{File.dirname file_name}/.#{File.basename file_name, '.*'}.patched#{File.extname file_name}"

lib/truffle/rbconfig-for-mkmf.rb

@@ -132,22 +132,22 @@
 # compiler which disables this standard behaviour of the C preprocessor.
 begin
   with_conditional_preprocessing = proc do |command1, command2|
-    Truffle::CExt::Preprocessor.makefile_matcher("#{preprocess_ruby} #{cext_dir}/preprocess.rb $< | #{command1}", command2)
+    Truffle::CExt::Preprocessor.makefile_matcher(command1, command2)
   end
 
   for_file = proc do |compiler, flags, opt_command|
     "#{compiler} #{flags} $< && #{opt_command}"
   end
 
   for_pipe = proc do |compiler, flags, opt_command|
-    "#{compiler} -I$(<D) #{flags} - -o $@ && #{opt_command}"
+    "#{preprocess_ruby} #{cext_dir}/preprocess.rb $< | #{compiler} -I$(<D) #{flags} - -o $@ && #{opt_command}"
   end
 
   c_flags = '$(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG) -xc'
   cxx_flags = '$(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG) -xc++'
   opt_command = "#{opt} #{opt_passes} $@ -o $@"
 
-  mkconfig['TRUFFLE_RAW_COMPILE_C'] = for_file.call("$(CC)", c_flags, opt_command)
+  mkconfig['TRUFFLE_RAW_COMPILE_C'] = for_pipe.call('$(CC)', c_flags, opt_command)
   mkconfig['COMPILE_C']   = with_conditional_preprocessing.call(
     for_pipe.call('$(CC)', c_flags, opt_command),
     for_file.call('$(CC)', c_flags, opt_command))
@@ -160,6 +160,6 @@
 # From mkmf.rb: "$(CC) #{OUTFLAG}#{CONFTEST}#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
 mkconfig['TRY_LINK'] = "#{cc} -o conftest $(INCFLAGS) $(CPPFLAGS) #{base_cflags} #{link_o_files} $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
 
-%w[COMPILE_C COMPILE_CXX TRY_LINK].each do |key|
+%w[COMPILE_C COMPILE_CXX TRY_LINK TRUFFLE_RAW_COMPILE_C].each do |key|
   expanded[key] = mkconfig[key].gsub(/\$\((\w+)\)/) { expanded.fetch($1) { $& } }
 end