From 9cc4e8d03a4b365e2410f7003efa0d89290abcd0 Mon Sep 17 00:00:00 2001 From: yangfl Date: Fri, 5 Jan 2018 18:37:32 +0800 Subject: [PATCH] Makefile: get target platform from compiler --- Makefile | 14 ++++++++------ Makefile.bsd | 2 +- Makefile.linux | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a8514826..460b16e4 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ -UNAME := $(shell uname -s) +SYS := $(shell $(CXX) -dumpmachine) SHLIB := libi2pd.so ARLIB := libi2pd.a SHLIB_CLIENT := libi2pdclient.so ARLIB_CLIENT := libi2pdclient.a -I2PD := i2pd +I2PD := i2pd GREP := grep DEPS := obj/make.dep @@ -23,22 +23,24 @@ ifeq ($(WEBSOCKETS),1) NEEDED_CXXFLAGS += -DWITH_EVENTS endif -ifeq ($(UNAME),Darwin) +ifneq (, $(findstring darwin, $(SYS))) DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp ifeq ($(HOMEBREW),1) include Makefile.homebrew else include Makefile.osx endif -else ifeq ($(shell echo $(UNAME) | $(GREP) -Ec '(Free|Open)BSD'),1) +else ifneq (, $(findstring freebsd, $(SYS))$(findstring openbsd, $(SYS))) DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp include Makefile.bsd -else ifeq ($(UNAME),Linux) +else ifneq (, $(findstring linux, $(SYS))) DAEMON_SRC += $(DAEMON_SRC_DIR)/UnixDaemon.cpp include Makefile.linux -else +else ifneq (, $(findstring mingw, $(SYS))$(findstring cygwin, $(SYS))) DAEMON_SRC += Win32/DaemonWin32.cpp Win32/Win32Service.cpp Win32/Win32App.cpp include Makefile.mingw +else # not supported +$(error Not supported platform) endif ifeq ($(USE_MESHNET),yes) diff --git a/Makefile.bsd b/Makefile.bsd index d6871f07..f2293540 100644 --- a/Makefile.bsd +++ b/Makefile.bsd @@ -1,5 +1,5 @@ CXX = clang++ -CXXFLAGS = -O2 +CXXFLAGS ?= -g -Wall -Wextra -Wno-unused-parameter -pedantic -Wno-misleading-indentation ## NOTE: NEEDED_CXXFLAGS is here so that custom CXXFLAGS can be specified at build time ## **without** overwriting the CXXFLAGS which we need in order to build. ## For example, when adding 'hardening flags' to the build diff --git a/Makefile.linux b/Makefile.linux index eec1e2cc..e628b63c 100644 --- a/Makefile.linux +++ b/Makefile.linux @@ -24,7 +24,7 @@ else ifeq ($(shell expr match ${CXXVER} "[5-7]\.[0-9]"),3) # gcc >= 5.0 else ifeq ($(shell expr match ${CXXVER} "7"),1) # gcc 7 ubuntu NEEDED_CXXFLAGS += -std=c++11 else # not supported - $(error Compiler too old) +$(error Compiler too old) endif NEEDED_CXXFLAGS += -fPIC @@ -44,7 +44,7 @@ ifeq ($(USE_STATIC),yes) LDLIBS += -lpthread -static-libstdc++ -static-libgcc -lrt -ldl USE_AESNI := no else - LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread + LDLIBS = -lcrypto -lssl -lz -lboost_system -lboost_date_time -lboost_filesystem -lboost_program_options -lpthread -latomic endif # UPNP Support (miniupnpc 1.5 and higher)