Permalink
Browse files

Compile fib.c with gcc instead of g++.

Conflicts:

	build/common_library.rb
  • Loading branch information...
1 parent af31321 commit 208c7fd202c28e82d46b46b393a8096b931dfda4 @FooBarWidget FooBarWidget committed Sep 20, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 build/common_library.rb
@@ -139,7 +139,11 @@ def define_common_library_task(namespace, output_dir, extra_compiler_flags = nil
sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
sh "mkdir -p #{output_dir}/Utils" if !File.directory?("#{output_dir}/Utils")
sh "mkdir -p #{output_dir}/LoggingAgent" if !File.directory?("#{output_dir}/LoggingAgent")
- compile_cxx("ext/common/#{source_file}", "#{flags} -o #{object_file}")
+ if source_file =~ /\.c$/
+ compile_c("ext/common/#{source_file}", "#{flags} -o #{object_file}")
+ else
+ compile_cxx("ext/common/#{source_file}", "#{flags} -o #{object_file}")
+ end
end
end
end

0 comments on commit 208c7fd

Please sign in to comment.