diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile
index 7dab2ac92378..6ec82918c075 100644
--- a/clang/tools/driver/Makefile
+++ b/clang/tools/driver/Makefile
@@ -9,7 +9,9 @@
 LEVEL = ../../../..
 
 TOOLNAME = clang
+ifndef CLANG_IS_PRODUCTION
 TOOLALIAS = clang++
+endif
 CPPFLAGS += -I$(PROJ_SRC_DIR)/../../include -I$(PROJ_OBJ_DIR)/../../include
 CXXFLAGS = -fno-rtti