Skip to content

Commit 01dbbf6

Browse files
committed
Update include path for build scripts.
1 parent bef588b commit 01dbbf6

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

scripts/compile-abi.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ cp "${LIBCXXABI_OBJ}/${OUTPUT_FULL}" "${OUT_DIR}/lib"
119119
(cd "${OUT_DIR}/lib"; ln -sf "${OUTPUT_FULL}" "${OUTPUT}.${OUTPUT_MAJOR}")
120120
(cd "${OUT_DIR}/lib"; ln -sf "${OUTPUT_FULL}" "${OUTPUT}")
121121

122+
mkdir -p "${OUT_DIR}/include"
123+
find "${LIBCXXABI_SRC}/include" -maxdepth 1 -name '*.h' -exec \
124+
cp {} "${OUT_DIR}/include" \;
125+
122126
rm -r "${LIBCXXABI_OBJ}"
123127

124128
echo done.

scripts/compile-libcxx.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ export LDFLAGS="-L${OUT_DIR}/lib"
88
mkdir -p "${LIBCXX_OBJ}"
99
cd "${LIBCXX_OBJ}"
1010

11+
EXTRA_CXX_FLAGS="-I${OUT_DIR}/include"
12+
1113
if [ -z "${CROSS_COMPILING}" ]; then
1214
CMAKE_FLAGS=(
1315
"-DCMAKE_INSTALL_PREFIX=${OUT_DIR}"
16+
"-DCMAKE_CXX_FLAGS=${EXTRA_CXX_FLAGS}"
1417
)
1518
elif [ "${CROSS_COMPILING}" = "arm" ]; then
1619
EXTRA_CXX_FLAGS+=" -mfloat-abi=hard"
@@ -24,7 +27,8 @@ elif [ "${CROSS_COMPILING}" = "arm" ]; then
2427
# Clang cross-compiler flags
2528
case ${CXX} in
2629
*clang*)
27-
EXTRA_CXX_FLAGS+=" -target arm-linux-gnueabihf -ccc-gcc-name arm-linux-gnueabihf-gcc-4.7"
30+
EXTRA_CXX_FLAGS+=" -target arm-linux-gnueabihf"
31+
EXTRA_CXX_FLAGS+=" -ccc-gcc-name arm-linux-gnueabihf-gcc-4.7"
2832
;;
2933
esac;
3034

0 commit comments

Comments
 (0)