diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-09-14 22:26:02 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-09-14 22:26:02 -0500 |
| commit | 483b825a2fb649c23d67082b8e7062a00e5180a7 (patch) | |
| tree | dc749c2283c7790a00a7c2878e4c4eb4091c35bf | |
| parent | ca304fc63d799f851bfa9c5267c3451a6a635c05 (diff) | |
| parent | 6c4a8fb81938b5067e23c819393ad272aaa01537 (diff) | |
| download | monzero-gui-483b825a2fb649c23d67082b8e7062a00e5180a7.tar.gz monzero-gui-483b825a2fb649c23d67082b8e7062a00e5180a7.tar.xz monzero-gui-483b825a2fb649c23d67082b8e7062a00e5180a7.zip | |
Merge pull request #4157
6c4a8fb DaemonManager.cpp: disable JIT on macOS ARM (selsta)
| -rw-r--r-- | src/daemon/DaemonManager.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp index 8dd31157..237ac545 100644 --- a/src/daemon/DaemonManager.cpp +++ b/src/daemon/DaemonManager.cpp @@ -117,8 +117,17 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const connect(m_daemon.get(), SIGNAL(readyReadStandardOutput()), this, SLOT(printOutput())); connect(m_daemon.get(), SIGNAL(readyReadStandardError()), this, SLOT(printError())); - // Start monerod - bool started = m_daemon->startDetached(m_monerod, arguments); +#if defined(Q_OS_MAC) && defined(__aarch64__) + // RandomX crashes with JIT enabled when started as a detached process, disable it for now + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("MONERO_RANDOMX_UMASK", "8"); + m_daemon->setProcessEnvironment(env); +#endif + + m_daemon->setProgram(m_monerod); + m_daemon->setArguments(arguments); + bool started = m_daemon->startDetached(); + // add state changed listener connect(m_daemon.get(), SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(stateChanged(QProcess::ProcessState))); |
