--- Parser/Makefile.PL	2014-03-11 19:59:40.000000000 -0300
+++ Parser/Makefile.PL	2014-06-25 11:19:19.000000000 -0300
@@ -9,13 +9,15 @@
 
 sub MY::postamble {
     my $out;
+    
+    $CXX = $ENV{CXX};
     #print Config::myconfig();
     if ($Config{osname} !~ /cygwin/i && $Config{archname} !~ /cygwin/i
 	&& $Config{osname} !~ /darwin/i && $Config{archname} !~ /darwin/i) {
 	# Cygwin: Don't change LD, it breaks
 	# Sun: Requires g++ LD
 	# Linux: Either way
-	$out .= "LD = g++\n";
+	$out .= "LD = $CXX\n";
     }
     # Note OPTIMIZE is passed from upper makefile, so this code needed there too.
     my $optimize = $Config{optimize};  $optimize =~ s/(^| )-O2( |$)/\1-O\2/g;
@@ -46,7 +48,7 @@
     $out .= "${cmt}CFLAGS += -DFLEX_DEBUG\n";
     $out .= "LEXFLAGS += -d\n";
     $out .= '
-CC = $(OBJCACHE) g++
+CC = $(OBJCACHE) $(CXX)
 LEX = flex
 YACC = bison
 PPSRC = ../Preproc