1 files changed, 13 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index d2fcef3..9cc820f 100644
--- a/Makefile
+++ b/Makefile
@@ -71,10 +71,19 @@ HHVM_STATIC_LIBRARY    =   libhhvmcpp.a
 #   library file. By default, g++ (the GNU C++ compiler) is used for both.
 #
 
-COMPILER        		=   g++
-LINKER     				=   g++
-ARCHIVER				=	ar rcs
-
+ifdef CXX
+ COMPILER			=   ${CXX}
+ LINKER                         =   ${CXX}
+else
+ COMPILER        		=   g++
+ LINKER                         =   g++
+endif
+
+ifdef AR
+  ARCHIVER                      = ${AR} rcs
+else
+  ARCHIVER			= ar rcs
+endif
 
 #
 #   Compiler flags