Rakefile in ruby-vpi-17.0.0 vs Rakefile in ruby-vpi-18.0.0

@@ -79,17 +79,17 @@
     taskName = "build_#{id}"
 
     desc "Builds object files for #{sim.name}."
     task taskName => ['obj', 'ext'] do
       src = PROJECT_ID + '.' + Config::CONFIG['DLEXT']
-      dst = File.expand_path(File.join('obj', id.to_s))
+      dst = File.expand_path(File.join('obj', "#{id}.so"))
 
       unless File.exist? dst
         cd 'ext' do
-          ENV['CFLAGS']  = "#{ccFlags} #{sim.compiler_args}"
-          ENV['LDFLAGS'] = "#{ldFlags} #{sim.linker_args}"
+          ENV['CFLAGS']  = [ccFlags, sim.compiler_args].compact.join(' ')
+          ENV['LDFLAGS'] = [ldFlags, sim.linker_args].compact.join(' ')
 
-          sh 'rake'
+          sh "rake SIMULATOR=#{id}"
           mv src, dst
           sh 'rake clean'
         end
       end
     end