Revert to --allow-multiple-definition: Adafruit v3.7.7 needs its own TinyUSB core files (newer API than lib in esp32 core)
This commit is contained in:
+1
-19
@@ -1,21 +1,3 @@
|
|||||||
Import("env")
|
Import("env")
|
||||||
import os
|
|
||||||
|
|
||||||
lib_path = os.path.join(
|
env.Append(LINKFLAGS=["-Wl,--allow-multiple-definition"])
|
||||||
env.subst("$PROJECT_DIR"),
|
|
||||||
".pio", "libdeps", env.subst("$PIOENV"),
|
|
||||||
"Adafruit TinyUSB Library", "src"
|
|
||||||
)
|
|
||||||
|
|
||||||
conflicting = [
|
|
||||||
"tusb.c",
|
|
||||||
"common/tusb_fifo.c",
|
|
||||||
"device/usbd.c",
|
|
||||||
"device/usbd_control.c",
|
|
||||||
]
|
|
||||||
|
|
||||||
for f in conflicting:
|
|
||||||
path = os.path.join(lib_path, f)
|
|
||||||
if os.path.exists(path):
|
|
||||||
os.remove(path)
|
|
||||||
print(f"[extra_script] Removed {f} (provided by ESP32 core libarduino_tinyusb.a)")
|
|
||||||
|
|||||||
Reference in New Issue
Block a user