Skip to content

Commit 27eeadb

Browse files
committed
Suppress building wish on all platforms
1 parent 9e58f95 commit 27eeadb

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

cpython-unix/build-tk.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,14 @@ CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ./configure \
4242
${EXTRA_CONFIGURE_FLAGS}
4343

4444
# Remove wish, since we don't need it.
45-
if [[ "${PYBUILD_PLATFORM}" != macos* ]]; then
46-
sed -i 's/all: binaries libraries doc/all: libraries/' Makefile
47-
sed -i 's/install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}/install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE)/' Makefile
48-
fi
45+
sed -i '' 's/all: binaries libraries doc/all: libraries/' Makefile
46+
sed -i '' 's/install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}/install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE)/' Makefile
4947

5048
# For some reason musl isn't link libXau and libxcb. So we hack the Makefile
5149
# to do what we want.
5250
if [ "${CC}" = "musl-clang" ]; then
53-
sed -i 's/-ldl -lpthread /-ldl -lpthread -lXau -lxcb/' tkConfig.sh
54-
sed -i 's/-lpthread $(X11_LIB_SWITCHES) -ldl -lpthread/-lpthread $(X11_LIB_SWITCHES) -ldl -lpthread -lXau -lxcb/' Makefile
51+
sed -i '' 's/-ldl -lpthread /-ldl -lpthread -lXau -lxcb/' tkConfig.sh
52+
sed -i '' 's/-lpthread $(X11_LIB_SWITCHES) -ldl -lpthread/-lpthread $(X11_LIB_SWITCHES) -ldl -lpthread -lXau -lxcb/' Makefile
5553
fi
5654

5755
make -j ${NUM_CPUS}

0 commit comments

Comments
 (0)