From 319785050f824fecd04ef33d6ae7ec06a9dafd9b Mon Sep 17 00:00:00 2001
From: Evan Phoenix <ephoenix@engineyard.com>
Date: Wed, 30 Jul 2008 16:31:53 -0700
Subject: [PATCH] Fix using strlcpy and strlcat, respect CC

---
 rakelib/vm.rake | 6 +++---
 vm/ffi.cpp      | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rakelib/vm.rake b/rakelib/vm.rake
index 8d54f29a26..f194125fd3 100644
--- a/rakelib/vm.rake
+++ b/rakelib/vm.rake
@@ -39,9 +39,9 @@ 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 }
@@ -49,7 +49,7 @@ def compile(obj, src)
 
   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
index 729b4414cc..86a074440b 100644
--- 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"