Reintroduce depth 2 razoring (with additional margin)

[stockfish] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 72afcc35629405af04cb8d583172472277a98330..5f50c3808c09885a48588578535a8d97972d8843 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -279,39 +279,16 @@ ifeq ($(optimize),yes)
        CXXFLAGS += -O3
 
        ifeq ($(comp),gcc)
-
-               ifeq ($(KERNEL),Darwin)
-                       ifeq ($(arch),i386)
-                               CXXFLAGS += -mdynamic-no-pic
-                       endif
-                       ifeq ($(arch),x86_64)
-                               CXXFLAGS += -mdynamic-no-pic
-                       endif
-               endif
-
                ifeq ($(OS), Android)
                        CXXFLAGS += -fno-gcse -mthumb -march=armv7-a -mfloat-abi=softfp
                endif
        endif
-
-       ifeq ($(comp),icc)
+       
+       ifeq ($(comp),$(filter $(comp),gcc clang icc))
                ifeq ($(KERNEL),Darwin)
                        CXXFLAGS += -mdynamic-no-pic
                endif
        endif
-
-       ifeq ($(comp),clang)
-               ifeq ($(KERNEL),Darwin)
-                               CXXFLAGS += -flto
-                               LDFLAGS += $(CXXFLAGS)
-                       ifeq ($(arch),i386)
-                               CXXFLAGS += -mdynamic-no-pic
-                       endif
-                       ifeq ($(arch),x86_64)
-                               CXXFLAGS += -mdynamic-no-pic
-                       endif
-               endif
-       endif
 endif
 
 ### 3.4 Bits
@@ -349,24 +326,20 @@ endif
 ### 3.8 Link Time Optimization, it works since gcc 4.5 but not on mingw under Windows.
 ### This is a mix of compile and link time options because the lto link phase
 ### needs access to the optimization flags.
-ifeq ($(comp),gcc)
-       ifeq ($(optimize),yes)
-       ifeq ($(debug),no)
+ifeq ($(optimize),yes)
+ifeq ($(debug), no)
+       ifeq ($(comp),$(filter $(comp),gcc clang))
                CXXFLAGS += -flto
                LDFLAGS += $(CXXFLAGS)
        endif
-       endif
-endif
 
-ifeq ($(comp),mingw)
+       ifeq ($(comp),mingw)
        ifeq ($(KERNEL),Linux)
-       ifeq ($(optimize),yes)
-       ifeq ($(debug),no)
                CXXFLAGS += -flto
                LDFLAGS += $(CXXFLAGS)
        endif
        endif
-       endif
+endif
 endif
 
 ### 3.9 Android 5 can only run position independent executables. Note that this