remove cxx11

CMakeLists.txt

@@ -5,24 +5,10 @@ set(PROJECT_NAME lokinet)
 project(${PROJECT_NAME} C CXX ASM)
 
 option(USE_LIBABYSS "enable libabyss" )
-option(USE_CXX17 "enable c++17 features" )
 option(USE_AVX2 "enable avx2 code" )
-# Require C++11
-# or C++17 on win32
-if (NOT WIN32)
-  if(USE_CXX17)
-    set(CMAKE_CXX_STANDARD 17)
-  else()
-    if(ANDROID)
-      set(CMAKE_CXX_STANDARD 17)
-    else()
-      set(CMAKE_CXX_STANDARD 11)
-    endif()
-  endif()
-else()
-  set(CMAKE_CXX_STANDARD 17)
-endif(NOT WIN32)
 
+# Require C++17
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

Makefile

@@ -46,7 +46,6 @@ GRADLE ?= gradle
 JAVA_HOME ?= /usr/lib/jvm/default-java
 
 JSONRPC ?= OFF
-CXX17 ?= ON
 AVX2 ?= ON
 RPI ?= OFF
 STATIC_LINK ?= OFF
@@ -55,7 +54,7 @@ CMAKE_GEN ?= Unix Makefiles
 
 BUILD_ROOT = $(REPO)/build
 
-CONFIG_CMD = $(shell /bin/echo -n "cd '$(BUILD_ROOT)' && " ; /bin/echo -n "cmake -G'$(CMAKE_GEN)' -DSTATIC_LINK=$(STATIC_LINK) -DUSE_AVX2=$(AVX2) -DUSE_CXX17=$(CXX17) -DUSE_LIBABYSS=$(JSONRPC) -DRPI=$(RPI) '$(REPO)'")
+CONFIG_CMD = $(shell /bin/echo -n "cd '$(BUILD_ROOT)' && " ; /bin/echo -n "cmake -G'$(CMAKE_GEN)' -DSTATIC_LINK=$(STATIC_LINK) -DUSE_AVX2=$(AVX2) -DUSE_LIBABYSS=$(JSONRPC) -DRPI=$(RPI) '$(REPO)'")
 
 SCAN_BUILD ?= scan-build
 ANALYZE_CONFIG_CMD = $(shell /bin/echo -n "cd '$(BUILD_ROOT)' && " ; /bin/echo -n "$(SCAN_BUILD) cmake -DUSE_LIBABYSS=$(JSONRPC) '$(REPO)'")