]>
Commit | Line | Data |
---|---|---|
b685a1e3 AM |
1 | --- tk8.6.12/unix/Makefile.in~ 2021-11-04 16:06:24.000000000 +0100 |
2 | +++ tk8.6.12/unix/Makefile.in 2021-11-11 15:09:46.142920245 +0100 | |
3 | @@ -281,8 +281,8 @@ TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS | |
196f6d51 JB |
4 | # Additional search flags needed to find the various shared libraries |
5 | # at run-time. The first symbol is for use when creating a binary | |
6 | # with cc, and the second is for use when running ld directly. | |
7 | -CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@ | |
8 | -LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ | |
9 | +CC_SEARCH_FLAGS = | |
10 | +LD_SEARCH_FLAGS = | |
11 | ||
12 | # support for embedded libraries on Darwin / Mac OS X | |
b685a1e3 AM |
13 | DYLIB_INSTALL_DIR = $(libdir) |
14 | --- tk8.6.12/unix/tcl.m4~ 2021-11-11 15:08:12.000000000 +0100 | |
15 | +++ tk8.6.12/unix/tcl.m4 2021-11-11 15:09:58.622920240 +0100 | |
16 | @@ -1991,7 +1991,7 @@ dnl # preprocessing tests use only CPPFL | |
196f6d51 | 17 | |
743afa79 | 18 | AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ |
196f6d51 | 19 | LIB_SUFFIX=${SHARED_LIB_SUFFIX} |
b685a1e3 AM |
20 | - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' |
21 | + MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' | |
8311ba4f | 22 | AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ |
a228d938 | 23 | INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' |
8311ba4f | 24 | DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" |