diff options
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r-- | unix/tcl.m4 | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 229e0b8..f11e019 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1211,12 +1211,14 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LD_SEARCH_FLAGS="" ;; BSD/OS-4.*) - SHLIB_CFLAGS="-export-dynamic -fPIC" + SHLIB_CFLAGS="-fPIC" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -export-dynamic" + AS_IF([test "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -export-dynamic" + ]) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" ;; @@ -1240,8 +1242,10 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LD_SEARCH_FLAGS="" ;; Haiku*) - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" SHLIB_CFLAGS="-fPIC" + AS_IF([test "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + ]) SHLIB_SUFFIX=".so" SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' DL_OBJS="tclLoadDl.o" @@ -1390,7 +1394,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + AS_IF([test "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + ]) AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} @@ -1422,7 +1428,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD='${CC} -shared' DL_OBJS="" DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + AS_IF([test "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + ]) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) @@ -1434,7 +1442,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD='${CC} -shared' DL_OBJS="tclLoadDl.o" DL_LIBS="-mshared -ldl" - LD_FLAGS="-Wl,--export-dynamic" + AS_IF([test "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + ]) AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) @@ -1524,9 +1534,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ yes #endif ], tcl_cv_ld_elf=yes, tcl_cv_ld_elf=no)]) - AS_IF([test $tcl_cv_ld_elf = yes], [ - LDFLAGS=-Wl,-export-dynamic - ], [LDFLAGS=""]) + AS_IF([test $tcl_cv_ld_elf = yes -a "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + ]) AS_IF([test "${TCL_THREADS}" = "1"], [ # On OpenBSD: Compile with -pthread # Don't link with -lpthread @@ -1545,7 +1555,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" - LDFLAGS="$LDFLAGS -export-dynamic" + AS_IF([test "$SHARED_BUILD" = 0], [ + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + ]) AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} |