From 0ca2ce0214b46f616532b48e8c5612a2f9dc5e68 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com>
Date: Tue, 1 Oct 2019 09:00:56 +0200
Subject: [PATCH] cpu/esp32: unconditionally disable thin archives

Thin archives also cause a boot loop when using the flash module.
To prevent further surprises, disable thin archives unconditionally
until the cause for this behaviour is known.
---
 cpu/esp32/Makefile.dep     | 3 ---
 cpu/esp32/Makefile.include | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpu/esp32/Makefile.dep b/cpu/esp32/Makefile.dep
index be85ce7311..4f9704264c 100644
--- a/cpu/esp32/Makefile.dep
+++ b/cpu/esp32/Makefile.dep
@@ -42,9 +42,6 @@ ifneq (,$(filter esp_wifi_any,$(USEMODULE)))
     # crypto and hashes produce symbol conflicts with esp_idf_wpa_supplicant_crypto
     DISABLE_MODULE += crypto
     DISABLE_MODULE += hashes
-
-    # thin archives trigger a reboot loop - see #12258
-    ARFLAGS = rcs
 endif
 
 ifneq (,$(filter esp_idf_nvs_flash,$(USEMODULE)))
diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include
index 3e53fbcc7c..90cd21dc18 100644
--- a/cpu/esp32/Makefile.include
+++ b/cpu/esp32/Makefile.include
@@ -112,6 +112,9 @@ OPTIONAL_CFLAGS_BLACKLIST += -gz
 
 ASFLAGS += --longcalls --text-section-literals
 
+# thin archives trigger a reboot loop - see #12258, #12035, #12346
+ARFLAGS = rcs
+
 ifneq ($(CONFIGS),)
     CFLAGS += $(CONFIGS)
 endif