diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e2578eba..d88f7c24d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,6 @@ endif() option(SHADOW "use shadow testing framework. linux only" OFF) option(XSAN "use sanitiser, if your system has it" OFF) option(JEMALLOC "use jemalloc. Not required on BSD" OFF) -option(DEBIAN "build for debian" OFF) option(TESTNET "testnet build" OFF) option(WITH_SHARED "build shared library" OFF) option(WITH_COVERAGE "generate coverage data" OFF) @@ -121,7 +120,7 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW) message( FATAL_ERROR "shadow-framework is Linux only" ) endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND SHADOW) -if(NOT DEBIAN AND NOT MSVC_VERSION) +if(NOT MSVC_VERSION) set(OPTIMIZE_FLAGS -O3) set(DEBUG_FLAGS -O0 -g3) endif() @@ -177,9 +176,7 @@ if (WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE) include(cmake/cross_compile.cmake) endif(WOW64_CROSS_COMPILE OR WIN64_CROSS_COMPILE) -if(DEBIAN) - add_definitions(-DDEBIAN) -elseif(NATIVE_BUILD) +if(NATIVE_BUILD) if(CMAKE_SYSTEM_PROCESSOR STREQUAL ppc64le) set(CRYPTO_FLAGS -mcpu=native -mtune=native) else() diff --git a/llarp/constants/defaults.hpp b/llarp/constants/defaults.hpp index 04549e60d..fa2b9ff25 100644 --- a/llarp/constants/defaults.hpp +++ b/llarp/constants/defaults.hpp @@ -11,20 +11,11 @@ #define DEFAULT_RESOLVER_AU "1.1.1.1" #endif -#ifdef DEBIAN -#ifndef DEFAULT_LOKINET_USER -#define DEFAULT_LOKINET_USER "debian-lokinet" -#endif -#ifndef DEFAULT_LOKINET_GROUP -#define DEFAULT_LOKINET_GROUP "debian-lokinet" -#endif -#else #ifndef DEFAULT_LOKINET_USER #define DEFAULT_LOKINET_USER "lokinet" #endif #ifndef DEFAULT_LOKINET_GROUP #define DEFAULT_LOKINET_GROUP "lokinet" #endif -#endif #endif