Skip to content

Commit b52503c

Browse files
authored
rm -fdebug-prefix-map entrys from "CCFLAGS"
1 parent c31135e commit b52503c

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

tools/copy-libs.sh

Lines changed: 4 additions & 11 deletions
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
@@ -484,13 +484,6 @@ echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags"
484484
echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
485485
echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
486486

487-
# sr model.bin
488-
if [ -f "build/srmodels/srmodels.bin" ]; then
489-
mkdir -p "$AR_SDK/esp_sr"
490-
cp -f "build/srmodels/srmodels.bin" "$AR_SDK/esp_sr/"
491-
cp -f "partitions.csv" "$AR_SDK/esp_sr/"
492-
fi
493-
494487
# sdkconfig
495488
cp -f "sdkconfig" "$AR_SDK/sdkconfig"
496489

0 commit comments

Comments
 (0)