diff options
| author | nijtmans <nijtmans> | 2009-02-10 22:06:21 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2009-02-10 22:06:21 (GMT) |
| commit | 1aed94c9ad7ed6440eb8d1d3404b28d7368738eb (patch) | |
| tree | e88050dc69af9eb3cb462aefff0781d3cfa2afd0 | |
| parent | 469c326d047ae0d60d8da25d61a997bef8d3d749 (diff) | |
| download | tk-1aed94c9ad7ed6440eb8d1d3404b28d7368738eb.zip tk-1aed94c9ad7ed6440eb8d1d3404b28d7368738eb.tar.gz tk-1aed94c9ad7ed6440eb8d1d3404b28d7368738eb.tar.bz2 | |
fix [tcl-Bug 2502365] Building of head on HPUX is
broken when using the native CC.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | unix/configure | 13 | ||||
| -rw-r--r-- | unix/tcl.m4 | 13 |
3 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,9 @@ +2009-02-10 Jan Nijtmans <nijtmans@users.sf.net> + + * unix/tcl.m4: fix [tcl-Bug 2502365] Building of head on HPUX is + broken when using the native CC. + * unix/configure (autoconf-2.59) + 2008-02-08 Joe English <jenglish@users.sourceforge.net> * generic/ttk/*.[ch]: Renamed several internal data structures diff --git a/unix/configure b/unix/configure index 9485330..c8338de 100755 --- a/unix/configure +++ b/unix/configure @@ -4996,12 +4996,14 @@ fi if test "$tcl_ok" = yes; then + SHLIB_CFLAGS="+z" + SHLIB_LD="ld -b" SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" LDFLAGS="$LDFLAGS -Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' - LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" fi @@ -5009,18 +5011,19 @@ fi if test "$GCC" = yes; then SHLIB_LD='${CC} -shared' + SHLIB_LD_LIBS='${LIBS}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} else CFLAGS="$CFLAGS -z" - # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc - #CFLAGS="$CFLAGS +DAportable" - SHLIB_CFLAGS="+z" - SHLIB_LD="${CC} -b" fi + # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc + #CFLAGS="$CFLAGS +DAportable" + # Check to enable 64-bit flags for compiler/linker if test "$do64bit" = "yes"; then diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3c82975..bcd3611 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1268,24 +1268,27 @@ dnl AC_CHECK_TOOL(AR, ar) ]) AC_CHECK_LIB(dld, shl_load, tcl_ok=yes, tcl_ok=no) AS_IF([test "$tcl_ok" = yes], [ + SHLIB_CFLAGS="+z" + SHLIB_LD="ld -b" SHLIB_LD_LIBS='${LIBS}' DL_OBJS="tclLoadShl.o" DL_LIBS="-ldld" LDFLAGS="$LDFLAGS -Wl,-E" CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' - LD_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.' + LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.' LD_LIBRARY_PATH_VAR="SHLIB_PATH" ]) AS_IF([test "$GCC" = yes], [ SHLIB_LD='${CC} -shared' + SHLIB_LD_LIBS='${LIBS}' + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} ], [ CFLAGS="$CFLAGS -z" - # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc - #CFLAGS="$CFLAGS +DAportable" - SHLIB_CFLAGS="+z" - SHLIB_LD="${CC} -b" ]) + # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc + #CFLAGS="$CFLAGS +DAportable" + # Check to enable 64-bit flags for compiler/linker AS_IF([test "$do64bit" = "yes"], [ AS_IF([test "$GCC" = yes], [ |