diff --git a/Makefile b/Makefile index 9084e7391..47e32c272 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ GIT_VERSION ?= $(shell git describe --long --abbrev=7) ifndef GIT_VERSION -$(error GIT_VERSION is not set) + $(error GIT_VERSION is not set) endif ### NOTES: @@ -47,7 +47,7 @@ ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') LEGACY_BUILD := 1 ifneq ($(CPLUSPLUS),201103L) - $(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) diff --git a/deps/Makefile b/deps/Makefile index 7fa0cec5b..2b28c2cec 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -32,7 +32,7 @@ CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') ifneq ($(CPLUSPLUS),201103L) - $(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) diff --git a/lib/Makefile b/lib/Makefile index c752ff254..b9f61c6cd 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -3,7 +3,7 @@ GIT_VERSION ?= $(shell git describe --long --abbrev=7) ifndef GIT_VERSION - $(error GIT_VERSION is not set) + $(error GIT_VERSION is not set) endif DEPS_PATH := ../deps @@ -95,7 +95,7 @@ CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') ifneq ($(CPLUSPLUS),201103L) -$(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) @@ -122,8 +122,8 @@ default: libproxysql.a .PHONY: default _OBJ_CXX := ProxySQL_GloVars.oo network.oo debug.oo configfile.oo Query_Cache.oo SpookyV2.oo MySQL_Authentication.oo gen_utils.oo sqlite3db.oo mysql_connection.oo MySQL_HostGroups_Manager.oo mysql_data_stream.oo MySQL_Thread.oo MySQL_Session.oo MySQL_Protocol.oo mysql_backend.oo Query_Processor.oo ProxySQL_Admin.oo ProxySQL_Config.oo ProxySQL_Restapi.oo MySQL_Monitor.oo MySQL_Logger.oo thread.oo MySQL_PreparedStatement.oo ProxySQL_Cluster.oo ClickHouse_Authentication.oo ClickHouse_Server.oo ProxySQL_Statistics.oo Chart_bundle_js.oo ProxySQL_HTTP_Server.oo ProxySQL_RESTAPI_Server.oo font-awesome.min.css.oo main-bundle.min.css.oo set_parser.oo MySQL_Variables.oo c_tokenizer.oo proxysql_utils.oo proxysql_coredump.oo proxysql_sslkeylog.oo \ - sha256crypt.oo \ - proxysql_find_charset.oo ProxySQL_Poll.oo + sha256crypt.oo \ + proxysql_find_charset.oo ProxySQL_Poll.oo OBJ_CXX := $(patsubst %,$(ODIR)/%,$(_OBJ_CXX)) HEADERS := ../include/*.h ../include/*.hpp diff --git a/src/Makefile b/src/Makefile index 52a3d626e..67ea80f12 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ GIT_VERSION ?= $(shell git describe --long --abbrev=7) ifndef GIT_VERSION - $(error GIT_VERSION is not set) + $(error GIT_VERSION is not set) endif CENTOSVER := Unknown @@ -109,7 +109,7 @@ CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') ifneq ($(CPLUSPLUS),201103L) -$(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) diff --git a/test/tap/tap/Makefile b/test/tap/tap/Makefile index 39d6986f5..627fde406 100644 --- a/test/tap/tap/Makefile +++ b/test/tap/tap/Makefile @@ -3,7 +3,7 @@ GIT_VERSION ?= $(shell git describe --long --abbrev=7) ifndef GIT_VERSION - $(error GIT_VERSION is not set) + $(error GIT_VERSION is not set) endif @@ -42,7 +42,7 @@ CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') ifneq ($(CPLUSPLUS),201103L) - $(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile index 235c9a854..965146eee 100644 --- a/test/tap/tests/Makefile +++ b/test/tap/tests/Makefile @@ -3,7 +3,7 @@ GIT_VERSION ?= $(shell git describe --long --abbrev=7) ifndef GIT_VERSION - $(error GIT_VERSION is not set) + $(error GIT_VERSION is not set) endif @@ -126,8 +126,8 @@ STATIC_LIBS := $(CITYHASH_LDIR)/libcityhash.a LIBCOREDUMPERAR := ifeq ($(UNAME_S),Linux) - LIBCOREDUMPERAR := $(COREDUMPER_LDIR)/libcoredumper.a - STATIC_LIBS += $(LIBCOREDUMPERAR) + LIBCOREDUMPERAR := $(COREDUMPER_LDIR)/libcoredumper.a + STATIC_LIBS += $(LIBCOREDUMPERAR) endif ### detect compiler support for c++11/17 @@ -135,7 +135,7 @@ CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') ifneq ($(CPLUSPLUS),201103L) - $(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4) diff --git a/test/tap/tests_with_deps/deprecate_eof_support/Makefile b/test/tap/tests_with_deps/deprecate_eof_support/Makefile index a1d719294..16fcbf35b 100644 --- a/test/tap/tests_with_deps/deprecate_eof_support/Makefile +++ b/test/tap/tests_with_deps/deprecate_eof_support/Makefile @@ -3,7 +3,7 @@ GIT_VERSION ?= $(shell git describe --long --abbrev=7) ifndef GIT_VERSION - $(error GIT_VERSION is not set) + $(error GIT_VERSION is not set) endif @@ -90,7 +90,7 @@ CPLUSPLUS := $(shell ${CC} -std=c++17 -dM -E -x c++ /dev/null 2>/dev/null | grep ifneq ($(CPLUSPLUS),201703L) CPLUSPLUS := $(shell ${CC} -std=c++11 -dM -E -x c++ /dev/null 2>/dev/null| grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL') ifneq ($(CPLUSPLUS),201103L) - $(error Compiler must support at least c++11) + $(error Compiler must support at least c++11) endif endif STDCPP := -std=c++$(shell echo $(CPLUSPLUS) | cut -c3-4) -DCXX$(shell echo $(CPLUSPLUS) | cut -c3-4)