From: Przemysław Pawełczyk <redacted>
Date: Mon, 29 Apr 2024 13:08:20 +0000 (+0200)
Subject: make : change GNU make default CXX from g++ to c++ (#6966)
X-Git-Tag: upstream/0.0.4488~1729
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=577277ffd203b190c3dc2ab3e737946dc432132c;p=pkg%2Fggml%2Fsources%2Fllama.cpp

make : change GNU make default CXX from g++ to c++ (#6966)
---

diff --git a/Makefile b/Makefile
index 9dc35410..e169cae8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,17 @@ ifndef UNAME_M
 UNAME_M := $(shell uname -m)
 endif
 
+# In GNU make default CXX is g++ instead of c++.  Let's fix that so that users
+# of non-gcc compilers don't have to provide g++ alias or wrapper.
+DEFCC  := cc
+DEFCXX := c++
+ifeq ($(origin CC),default)
+CC  := $(DEFCC)
+endif
+ifeq ($(origin CXX),default)
+CXX := $(DEFCXX)
+endif
+
 # Mac OS + Arm can report x86_64
 # ref: https://github.com/ggerganov/whisper.cpp/issues/66#issuecomment-1282546789
 ifeq ($(UNAME_S),Darwin)