X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2FMakefile;h=b6ffbe823cbb130a58702c8b09b7a94dc5bf81d4;hp=840312d972c8b4c473cb1e4cebba87ae2b0fda90;hb=55b46ffa909cf3873e4ac7129e324ed3eb1d0124;hpb=578b21bbeedc41b6e0d1b2df46887b1636a78e2b

diff --git a/src/Makefile b/src/Makefile
index 840312d9..b6ffbe82 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -151,11 +151,9 @@ endif
 ifeq ($(COMP),gcc)
 	comp=gcc
 	CXX=g++
-	CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow
+	CXXFLAGS += -pedantic -Wextra -Wshadow
 	ifneq ($(UNAME),Darwin)
 	   LDFLAGS += -Wl,--no-as-needed
-	else
-	   LDFLAGS += -Wl
 	endif
 endif
 
@@ -175,7 +173,7 @@ endif
 ifeq ($(COMP),clang)
 	comp=clang
 	CXX=clang++
-	CXXFLAGS += -pedantic -Wno-long-long -Wextra -Wshadow
+	CXXFLAGS += -pedantic -Wextra -Wshadow
 	ifeq ($(UNAME),Darwin)
 		CXXFLAGS += -std=c++0x -stdlib=libc++
 		DEPENDFLAGS += -std=c++0x -stdlib=libc++
@@ -199,6 +197,11 @@ ifeq ($(UNAME),Darwin)
 	LDFLAGS += -arch $(arch) -mmacosx-version-min=10.9
 endif
 
+### Travis CI script uses COMPILER to overwrite CXX
+ifdef COMPILER
+	CXX=$(COMPILER)
+endif
+
 ### On mingw use Windows threads, otherwise POSIX
 ifneq ($(comp),mingw)
 	# On Android Bionic's C library comes with its own pthread implementation bundled in