Skip to content

Commit c775127

Browse files
authored
Update copy-libs.sh
1 parent 23a98b4 commit c775127

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tools/copy-libs.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,17 @@ for item in "${@:2:${#@}-5}"; do
126126
DEFINES+="$item "
127127
fi
128128
elif [ "$prefix" = "-O" ]; then
129-
if [[ "$item" != "-std=gnu++2b" ]]; then
130-
PIO_CC_FLAGS+="$item "
131-
fi
129+
PIO_CC_FLAGS+="$item "
132130
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
133131
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=" && "${item:0:8}" != "-fno-lto" ]]; then
134132
C_FLAGS+="$item "
135133
fi
136134
fi
137135
done
138136

137+
# Remove -std=gnu++2b from PIO_CXX_FLAGS
138+
PIO_CXX_FLAGS="${PIO_CXX_FLAGS/-std=gnu++2b/}"
139+
139140
#collect asm-flags
140141
str=`cat build/compile_commands.json | grep arduino-lib-builder-as.S | grep command | cut -d':' -f2 | cut -d',' -f1`
141142
str="${str:2:${#str}-1}" #remove leading space and quotes

0 commit comments

Comments
 (0)