Fix using strlcpy and strlcat, respect CC

johnbender · Jul 30, 2008 · 3197850 · 3197850
1 parent a38df9f
commit 3197850
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/rakelib/vm.rake b/rakelib/vm.rake
@@ -39,17 +39,17 @@ FLAGS       = %w(-Wall -ggdb -gdwarf-2)
 
 FLAGS << "-O2" if ENV['FAST']
 
-def compile(obj, src)
-  cc = "gcc" # File.basename(src) == "c" ? "gcc" : "g++"
+CC = ENV['CC'] || "gcc"
 
+def compile(obj, src)
   unless defined? $llvm_c then
     $llvm_c = `#{LLVM_CONFIG} --cflags`.split(/\s+/)
     $llvm_c.delete_if { |e| e.index("-O") == 0 }
   end
 
   flags = (INCLUDES + FLAGS + $llvm_c).join(' ')
 
-  sh "#{cc} #{flags} -c -o #{obj} #{src} 2>&1"
+  sh "#{CC} #{flags} -c -o #{obj} #{src} 2>&1"
 end
 
 ############################################################

diff --git a/vm/ffi.cpp b/vm/ffi.cpp
@@ -16,8 +16,10 @@
 #include "ffi.hpp"
 #include "message.hpp"
 
-#include "strlcpy.h"
-#include "strlcat.h"
+extern "C" {
+  #include "strlcpy.h"
+  #include "strlcat.h"
+}
 
 #ifdef _WIN32
 #define LIBSUFFIX ".dll"