Skip to content

Commit 32c8e7a

Browse files
chenxu2048indygreg
authored andcommitted
unix: fix CLFAGS typo in some scripts.
Some build-*.sh files under cpython-unix use CLFAGS while compiling. This typo causes build failed when trying build with aarch64-linux-musl, since some substantial flags like --target cannot be passed into makefile.
1 parent 7820a1b commit 32c8e7a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cpython-unix/build-gdbm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pushd gdbm-${GDBM_VERSION}
1515

1616
# CPython setup.py looks for libgdbm_compat and gdbm-ndbm.h,
1717
# which require --enable-libgdbm-compat.
18-
CLFAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" ./configure \
18+
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" ./configure \
1919
--build=${BUILD_TRIPLE} \
2020
--host=${TARGET_TRIPLE} \
2121
--prefix=/tools/deps \

cpython-unix/build-libedit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ if [ "${CC}" = "musl-clang" ]; then
8989
fi
9090

9191
# Install to /tools/deps/libedit so it doesn't conflict with readline's files.
92-
CLFAGS="${cflags}" CPPFLAGS="${cflags}" LDFLAGS="${ldflags}" \
92+
CFLAGS="${cflags}" CPPFLAGS="${cflags}" LDFLAGS="${ldflags}" \
9393
./configure \
9494
--build=${BUILD_TRIPLE} \
9595
--host=${TARGET_TRIPLE} \

cpython-unix/build-patchelf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tar -xf patchelf-${PATCHELF_VERSION}.tar.bz2
1313

1414
pushd patchelf-0.12.20200827.8d3a16e
1515

16-
CC="${HOST_CC}" CXX="${HOST_CXX}" CLFAGS="${EXTRA_HOST_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_HOST_CFLAGS} -fPIC" \
16+
CC="${HOST_CC}" CXX="${HOST_CXX}" CFLAGS="${EXTRA_HOST_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_HOST_CFLAGS} -fPIC" \
1717
./configure \
1818
--build=${BUILD_TRIPLE} \
1919
--host=${TARGET_TRIPLE} \
@@ -31,4 +31,4 @@ if [ -d /tools/${TOOLCHAIN}/lib ]; then
3131
LD_LIBRARY_PATH=/tools/${TOOLCHAIN}/lib src/patchelf --replace-needed libgcc_s.so.1 /tools/${TOOLCHAIN}/lib/libgcc_s.so.1 ${ROOT}/out/tools/host/bin/patchelf
3232
fi
3333

34-
${ROOT}/out/tools/host/bin/patchelf --version
34+
${ROOT}/out/tools/host/bin/patchelf --version

0 commit comments

Comments
 (0)