From 5b5d94cf0bb7cacf2e3d5e3dbc95feff418420aa Mon Sep 17 00:00:00 2001
From: Slavey Karadzhov <slavey.karadzhov@zend.com>
Date: Mon, 27 Oct 2014 15:53:28 +0100
Subject: Respect the CXX and AR env variables. One advantage of this small
 change is that during cross-compilation you do not need to adjust the
 Makefile.

---
 Makefile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'Makefile')

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
-- 
cgit v1.2.3