From 04df08a2776a81066646c33f5bae6f9698639fc0 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Thu, 30 Nov 2017 14:25:53 +0200
Subject: [PATCH] Rollback to previous toolchain

---
 tools/platformio-build.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/platformio-build.py b/tools/platformio-build.py
index b3274f4c25b..ff47ceff7c1 100644
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -48,7 +48,7 @@
         "-Wno-error=unused-function",
         "-Wno-unused-parameter",
         "-Wno-sign-compare",
-        "-fstack-protector"
+#         "-fstack-protector"
     ],
 
     CPPPATH=[
@@ -129,7 +129,8 @@ def _get_board_flash_mode(env):
         "-T", "esp32.rom.ld",
         "-T", "esp32.peripherals.ld",
         "-T", "esp32.rom.spiram_incompatible_fns.ld",
-        "-u", "ld_include_panic_highint_hdl"
+        "-u", "ld_include_panic_highint_hdl",
+        "-u", "__cxa_guard_dummy"
     ],
 
     UPLOADERFLAGS=[