From 7c1c7e8e225557cc30aabee20388db7abadc6bbd Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Mon, 16 Mar 2015 02:35:49 +0100 Subject: [PATCH] Using cc and c++ instead of gcc and g++. Not all systems are equal, and have gcc. However, cc and c++ are more common aliases for the system's compiler. FreeBSD is an example. --- Makefile | 24 ++++++++++++------------ templates/Makefile.template | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 3e1efc7646a..3be35814f44 100644 --- a/Makefile +++ b/Makefile @@ -51,29 +51,29 @@ GENDIR = $(BUILDDIR)/gens # Configurations VALID_CONFIG_opt = 1 -CC_opt = gcc -CXX_opt = g++ -LD_opt = gcc -LDXX_opt = g++ +CC_opt = cc +CXX_opt = c++ +LD_opt = cc +LDXX_opt = c++ CPPFLAGS_opt = -O2 LDFLAGS_opt = DEFINES_opt = NDEBUG VALID_CONFIG_dbg = 1 -CC_dbg = gcc -CXX_dbg = g++ -LD_dbg = gcc -LDXX_dbg = g++ +CC_dbg = cc +CXX_dbg = c++ +LD_dbg = cc +LDXX_dbg = c++ CPPFLAGS_dbg = -O0 LDFLAGS_dbg = DEFINES_dbg = _DEBUG DEBUG VALID_CONFIG_valgrind = 1 REQUIRE_CUSTOM_LIBRARIES_valgrind = 1 -CC_valgrind = gcc -CXX_valgrind = g++ -LD_valgrind = gcc -LDXX_valgrind = g++ +CC_valgrind = cc +CXX_valgrind = c++ +LD_valgrind = cc +LDXX_valgrind = c++ CPPFLAGS_valgrind = -O0 OPENSSL_CFLAGS_valgrind = -DPURIFY LDFLAGS_valgrind = diff --git a/templates/Makefile.template b/templates/Makefile.template index a69c7a7f2f1..148fa7cd633 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -68,29 +68,29 @@ GENDIR = $(BUILDDIR)/gens # Configurations VALID_CONFIG_opt = 1 -CC_opt = gcc -CXX_opt = g++ -LD_opt = gcc -LDXX_opt = g++ +CC_opt = cc +CXX_opt = c++ +LD_opt = cc +LDXX_opt = c++ CPPFLAGS_opt = -O2 LDFLAGS_opt = DEFINES_opt = NDEBUG VALID_CONFIG_dbg = 1 -CC_dbg = gcc -CXX_dbg = g++ -LD_dbg = gcc -LDXX_dbg = g++ +CC_dbg = cc +CXX_dbg = c++ +LD_dbg = cc +LDXX_dbg = c++ CPPFLAGS_dbg = -O0 LDFLAGS_dbg = DEFINES_dbg = _DEBUG DEBUG VALID_CONFIG_valgrind = 1 REQUIRE_CUSTOM_LIBRARIES_valgrind = 1 -CC_valgrind = gcc -CXX_valgrind = g++ -LD_valgrind = gcc -LDXX_valgrind = g++ +CC_valgrind = cc +CXX_valgrind = c++ +LD_valgrind = cc +LDXX_valgrind = c++ CPPFLAGS_valgrind = -O0 OPENSSL_CFLAGS_valgrind = -DPURIFY LDFLAGS_valgrind =