diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-06 12:11:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-06 12:11:05 (GMT) |
| commit | 6fd31ee6da8363577e3accc1102683159999edb2 (patch) | |
| tree | a542d2c5d75e72120ba1beb235dfbb3e61de4592 /unix | |
| parent | efb26166cd9347b21a12fe840e2c80d1e660cf31 (diff) | |
| download | tk-6fd31ee6da8363577e3accc1102683159999edb2.zip tk-6fd31ee6da8363577e3accc1102683159999edb2.tar.gz tk-6fd31ee6da8363577e3accc1102683159999edb2.tar.bz2 | |
Sync tcl.m4 with Tcl
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index acac5f6..029b866 100755 --- a/unix/configure +++ b/unix/configure @@ -5786,7 +5786,6 @@ fi # Step 4 will set the necessary variables DL_OBJS="" SHLIB_LD_LIBS="" - LDFLAGS="" ;; *) case "$arch" in @@ -5808,7 +5807,7 @@ fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' - LDFLAGS="-Wl,-export-dynamic" + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" ;; esac case "$arch" in @@ -5867,7 +5866,6 @@ fi SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" if test $doRpath = yes; then CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 95915e8..f4503f4 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1507,7 +1507,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Step 4 will set the necessary variables DL_OBJS="" SHLIB_LD_LIBS="" - LDFLAGS="" ;; *) case "$arch" in @@ -1526,7 +1525,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' - LDFLAGS="-Wl,-export-dynamic" + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" ;; esac case "$arch" in @@ -1576,7 +1575,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="" AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) |