Skip to content

Commit 91b32a0

Browse files
committed
unix: consistently pass --build and --host to configure
In some cases we were using --target incorrectly: --target should only come into play when compiling toolchains. In most places, we added --host and --target so it is present in nearly every build script. This makes build scripts more consistent.
1 parent b4e8d44 commit 91b32a0

21 files changed

+39
-3
lines changed

cpython-unix/build-bdb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pushd db-${BDB_VERSION}/build_unix
1515

1616
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" ../dist/configure \
1717
--build=${BUILD_TRIPLE} \
18-
--target=${TARGET_TRIPLE} \
18+
--host=${TARGET_TRIPLE} \
1919
--prefix=/tools/deps \
2020
--enable-dbm \
2121
--disable-shared

cpython-unix/build-gdbm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pushd gdbm-${GDBM_VERSION}
1717
# which require --enable-libgdbm-compat.
1818
CLFAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" ./configure \
1919
--build=${BUILD_TRIPLE} \
20-
--target=${TARGET_TRIPLE} \
20+
--host=${TARGET_TRIPLE} \
2121
--prefix=/tools/deps \
2222
--disable-shared \
2323
--enable-libgdbm-compat

cpython-unix/build-gettext.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pushd gettext-${GETTEXT_VERSION}
1717
# an added dependency. So we force use of the bundled version.
1818
CLFAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" ./configure \
1919
--build=${BUILD_TRIPLE} \
20-
--target=${TARGET_TRIPLE} \
20+
--host=${TARGET_TRIPLE} \
2121
--prefix=/tools/deps \
2222
--disable-shared \
2323
--disable-java \

cpython-unix/build-inputproto.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ tar -xf inputproto-${INPUTPROTO_VERSION}.tar.gz
1616
pushd inputproto-${INPUTPROTO_VERSION}
1717

1818
CFLAGS="-fPIC" ./configure \
19+
--build=${BUILD_TRIPLE} \
20+
--host=${TARGET_TRIPLE} \
1921
--prefix=/tools/deps
2022

2123
make -j `nproc`

cpython-unix/build-kbproto.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ tar -xf kbproto-${KBPROTO_VERSION}.tar.gz
1616
pushd kbproto-${KBPROTO_VERSION}
1717

1818
CFLAGS="-fPIC" ./configure \
19+
--build=${BUILD_TRIPLE} \
20+
--host=${TARGET_TRIPLE} \
1921
--prefix=/tools/deps
2022

2123
make -j `nproc`

cpython-unix/build-libX11.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ if [ "${CC}" = "musl-clang" ]; then
4242
fi
4343

4444
CFLAGS="-fPIC -I/tools/deps/include" ./configure \
45+
--build=${BUILD_TRIPLE} \
46+
--host=${TARGET_TRIPLE} \
4547
--prefix=/tools/deps \
4648
${EXTRA_FLAGS}
4749

cpython-unix/build-libXau.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ if [ "${CC}" = "musl-clang" ]; then
1818
fi
1919

2020
CFLAGS="-fPIC" ./configure \
21+
--build=${BUILD_TRIPLE} \
22+
--host=${TARGET_TRIPLE} \
2123
--prefix=/tools/deps \
2224
${EXTRA_FLAGS}
2325

cpython-unix/build-libpthread-stubs.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ tar -xf libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz
1616
pushd libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}
1717

1818
CFLAGS="-fPIC" ./configure \
19+
--build=${BUILD_TRIPLE} \
20+
--host=${TARGET_TRIPLE} \
1921
--prefix=/tools/deps
2022

2123
make -j `nproc`

cpython-unix/build-libxcb.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ if [ "${CC}" = "musl-clang" ]; then
1818
fi
1919

2020
CFLAGS="-fPIC" ./configure \
21+
--build=${BUILD_TRIPLE} \
22+
--host=${TARGET_TRIPLE} \
2123
--prefix=/tools/deps \
2224
${EXTRA_FLAGS}
2325

cpython-unix/build-sqlite.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ tar -xf sqlite-autoconf-${SQLITE_VERSION}.tar.gz
1313
pushd sqlite-autoconf-${SQLITE_VERSION}
1414

1515
CFLAGS="-fPIC" CPPFLAGS="-fPIC" ./configure \
16+
--build=${BUILD_TRIPLE} \
17+
--host=${TARGET_TRIPLE} \
1618
--prefix /tools/deps \
1719
--disable-shared
1820

0 commit comments

Comments
 (0)