Skip to content

Commit 80058ba

Browse files
authored
rm -fdebug-prefix-map entrys from "CCFLAGS"
from `platformio-build.py`
1 parent 4ab9e16 commit 80058ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tools/copy-libs.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ for item in "${@:2:${#@}-5}"; do
101101
elif [ "$prefix" = "-O" ]; then
102102
PIO_CC_FLAGS+="$item "
103103
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
104-
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" ]]; then
104+
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" ]]; then
105105
C_FLAGS+="$item "
106106
fi
107107
fi
@@ -115,7 +115,7 @@ set -- $str
115115
for item in "${@:2:${#@}-5}"; do
116116
prefix="${item:0:2}"
117117
if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
118-
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" ]]; then
118+
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" ]]; then
119119
AS_FLAGS+="$item "
120120
if [[ $C_FLAGS == *"$item"* ]]; then
121121
PIO_CC_FLAGS+="$item "
@@ -134,7 +134,7 @@ set -- $str
134134
for item in "${@:2:${#@}-5}"; do
135135
prefix="${item:0:2}"
136136
if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
137-
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" ]]; then
137+
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" ]]; then
138138
CPP_FLAGS+="$item "
139139
if [[ $PIO_CC_FLAGS != *"$item"* ]]; then
140140
PIO_CXX_FLAGS+="$item "
@@ -204,7 +204,7 @@ for item; do
204204
add_next=0
205205
is_script=0
206206
is_dir=0
207-
elif [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:17}" != "-Wl,--start-group" && "${item:0:15}" != "-Wl,--end-group" ]]; then
207+
elif [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:19}" != "-fdebug-prefix-map=" && "${item:0:17}" != "-Wl,--start-group" && "${item:0:15}" != "-Wl,--end-group" ]]; then
208208
LD_FLAGS+="$item "
209209
PIO_LD_FLAGS+="$item "
210210
fi
@@ -402,13 +402,13 @@ for item; do
402402
mkdir -p "$out_cpath$rel_p"
403403
cp -n $f "$out_cpath$rel_p/"
404404
done
405-
for f in `find "$item" -name '*.inc'`; do
405+
for f in `find "$item" -name '*.inc'`; do
406406
rel_f=${f#*$item}
407407
rel_p=${rel_f%/*}
408408
mkdir -p "$out_cpath$rel_p"
409409
cp -n $f "$out_cpath$rel_p/"
410410
done
411-
# Temporary measure to fix issues caused by https://github.com/espressif/esp-idf/commit/dc4731101dd567cc74bbe4d0f03afe52b7db9afb#diff-1d2ce0d3989a80830fdf230bcaafb3117f32046d16cf46616ac3d55b4df2a988R17
411+
# Temporary measure to fix issues caused by https://github.com/espressif/esp-idf/commit/dc4731101dd567cc74bbe4d0f03afe52b7db9afb#diff-1d2ce0d3989a80830fdf230bcaafb3117f32046d16cf46616ac3d55b4df2a988R17
412412
if [[ "$fname" == "bt" && "$out_sub" == "/include/$IDF_TARGET/include" && -f "$ipath/controller/$IDF_TARGET/esp_bt_cfg.h" ]]; then
413413
mkdir -p "$AR_SDK/include/$fname/controller/$IDF_TARGET"
414414
cp -n "$ipath/controller/$IDF_TARGET/esp_bt_cfg.h" "$AR_SDK/include/$fname/controller/$IDF_TARGET/esp_bt_cfg.h"

0 commit comments

Comments
 (0)