From 1675485aa80c5e9d6d298c316f93aba33a8a748c Mon Sep 17 00:00:00 2001
From: Michael Ryleev <gmar@google.com>
Date: Mon, 11 May 2015 15:19:42 -0700
Subject: [PATCH] [make] Update MAKECONFIGHEADER macro

Add "C++" => "CPP" translation to support libraries
having "c++" in their names, for example libstdc++.
Without such translation, resulting #define does not
compile.

Change-Id: Ieac533782a26b4ce87caf9ad2ec1105c25eeaf01
---
 make/macros.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/macros.mk b/make/macros.mk
index 9787e640..e1aaf489 100644
--- a/make/macros.mk
+++ b/make/macros.mk
@@ -39,7 +39,7 @@ define MAKECONFIGHEADER
 	echo \#ifndef __$${LDEF}_H > $1.tmp; \
 	echo \#define __$${LDEF}_H >> $1.tmp; \
 	for d in `echo $($2) | tr '[:lower:]' '[:upper:]'`; do \
-		echo "#define $$d" | sed "s/=/\ /g;s/-/_/g;s/\//_/g;s/\./_/g;s/\//_/g" >> $1.tmp; \
+		echo "#define $$d" | sed "s/=/\ /g;s/-/_/g;s/\//_/g;s/\./_/g;s/\//_/g;s/C++/CPP/g" >> $1.tmp; \
 	done; \
 	echo \#endif >> $1.tmp; \
 	$(call TESTANDREPLACEFILE,$1.tmp,$1)