CrimsonHawk/xmrig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1469 Fixed build with gcc 4.8.

Browse source
This commit is contained in:
XMRig 2019-12-30 16:04:07 +07:00
parent d5605a29b4
commit d64bbfa9c0
No known key found for this signature in database
GPG key ID: 446A53638BE94409
3 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -14,6 +14,7 @@ option(WITH_DEBUG_LOG "Enable debug log output" OFF)
option(WITH_TLS "Enable OpenSSL support" ON) option(WITH_TLS "Enable OpenSSL support" ON)
option(WITH_ASM "Enable ASM PoW implementations" ON) option(WITH_ASM "Enable ASM PoW implementations" ON)
option(WITH_MSR "Enable MSR mod & 1st-gen Ryzen fix" ON) option(WITH_MSR "Enable MSR mod & 1st-gen Ryzen fix" ON)
option(WITH_ENV_VARS "Enable environment variables support in config file" ON)
option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF) option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
option(WITH_OPENCL "Enable OpenCL backend" ON) option(WITH_OPENCL "Enable OpenCL backend" ON)
option(WITH_CUDA "Enable CUDA backend" ON) option(WITH_CUDA "Enable CUDA backend" ON)

12
src/base/base.cmake
View file

@ -169,3 +169,15 @@ else()
remove_definitions(/DXMRIG_FEATURE_HTTP) remove_definitions(/DXMRIG_FEATURE_HTTP)
remove_definitions(/DXMRIG_FEATURE_API) remove_definitions(/DXMRIG_FEATURE_API)
endif() endif()
if (WITH_ENV_VARS AND CMAKE_CXX_COMPILER_ID MATCHES GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
set(WITH_ENV_VARS OFF)
endif()
if (WITH_ENV_VARS)
add_definitions(/DXMRIG_FEATURE_ENV)
else()
remove_definitions(/DXMRIG_FEATURE_ENV)
endif()

8
src/base/kernel/Env.cpp
View file

@ -50,6 +50,7 @@
namespace xmrig { namespace xmrig {
#ifdef XMRIG_FEATURE_ENV
static std::map<String, String> variables; static std::map<String, String> variables;
@ -59,6 +60,7 @@ static void createVariables()
variables.insert({ "XMRIG_EXE_DIR", Process::location(Process::ExeLocation, "") }); variables.insert({ "XMRIG_EXE_DIR", Process::location(Process::ExeLocation, "") });
variables.insert({ "XMRIG_CWD", Process::location(Process::CwdLocation, "") }); variables.insert({ "XMRIG_CWD", Process::location(Process::CwdLocation, "") });
} }
#endif
} // namespace xmrig } // namespace xmrig
@ -66,6 +68,7 @@ static void createVariables()
xmrig::String xmrig::Env::expand(const char *in) xmrig::String xmrig::Env::expand(const char *in)
{ {
# ifdef XMRIG_FEATURE_ENV
if (in == nullptr) { if (in == nullptr) {
return {}; return {};
} }
@ -103,11 +106,15 @@ xmrig::String xmrig::Env::expand(const char *in)
} }
return text.c_str(); return text.c_str();
# else
return in;
# endif
} }
xmrig::String xmrig::Env::get(const String &name) xmrig::String xmrig::Env::get(const String &name)
{ {
# ifdef XMRIG_FEATURE_ENV
if (variables.empty()) { if (variables.empty()) {
createVariables(); createVariables();
} }
@ -115,6 +122,7 @@ xmrig::String xmrig::Env::get(const String &name)
if (variables.count(name)) { if (variables.count(name)) {
return variables.at(name); return variables.at(name);
} }
# endif
return static_cast<const char *>(getenv(name)); return static_cast<const char *>(getenv(name));
} }