Merge branch 'master' of https://github.com/espressif/arduino-esp32

21791821 · me-no-dev · 88bd512b · b2d01e0a · 21791821
Commit 21791821 authored Nov 30, 2017 by me-no-dev
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

tools/platformio-build.py tools/platformio-build.py +3 -2

No files found.
--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@@ -48,7 +48,7 @@ env.Prepend(
        "-Wno-error=unused-function",
        "-Wno-unused-parameter",
        "-Wno-sign-compare",
-        "-fstack-protector"
+#         "-fstack-protector"
    ],

    CPPPATH=[
@@ -129,7 +129,8 @@ env.Append(
        "-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=[