Skip to content

Commit aa790cc

Browse files
committed
Remove "include/config" from list of included paths
CC: espressif#6798
1 parent 3544fe4 commit aa790cc

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

tools/copy-libs.sh

+8-5
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,9 @@ for item; do
334334
if [[ "$fname" == "arduino" ]]; then
335335
continue
336336
fi
337+
if [[ "$fname" == "config" ]]; then
338+
continue
339+
fi
337340

338341
out_sub="${item#*$ipath}"
339342
out_cpath="$AR_SDK/include/$fname$out_sub"
@@ -469,15 +472,15 @@ for item; do
469472
done
470473
done
471474

472-
# Add IDF versions to sdkconfig
473-
echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "$AR_SDK/include/config/sdkconfig.h"
474-
echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "$AR_SDK/include/config/sdkconfig.h"
475-
476475
# Handle Mem Variants
477476
mkdir -p "$AR_SDK/$MEMCONF/include"
478-
mv "$AR_SDK/include/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
477+
mv "$PWD/build/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
479478
for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
480479
file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"')
481480
out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"')
482481
mv "$AR_SDK/$out" "$AR_SDK/$MEMCONF/$file"
483482
done;
483+
484+
# Add IDF versions to sdkconfig
485+
echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "$AR_SDK/$MEMCONF/include/sdkconfig.h"
486+
echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "$AR_SDK/$MEMCONF/include/sdkconfig.h"

0 commit comments

Comments
 (0)