diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-18 09:27:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-18 09:27:49 (GMT) |
| commit | 5c49a69e23a39899d22857e60d1219586919787e (patch) | |
| tree | 9e0f68fe81ee547a50bd78c79c60951818997b86 /unix/configure | |
| parent | c3314a7da7fb4a9ab5151e479dcaf0e70c76c89b (diff) | |
| parent | 096a5a92a718bd423529bb6c81122d7259f1d0e4 (diff) | |
| download | tk-5c49a69e23a39899d22857e60d1219586919787e.zip tk-5c49a69e23a39899d22857e60d1219586919787e.tar.gz tk-5c49a69e23a39899d22857e60d1219586919787e.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 49 |
1 files changed, 13 insertions, 36 deletions
diff --git a/unix/configure b/unix/configure index f76ae3b..a02e8c4 100755 --- a/unix/configure +++ b/unix/configure @@ -5358,46 +5358,23 @@ fi OpenBSD-*) arch=`arch -s` case "$arch" in - vax) - # Equivalent using configure option --disable-load - # Step 4 will set the necessary variables - DL_OBJS="" - SHLIB_LD_LIBS="" - LDFLAGS="" + alpha|sparc64) + SHLIB_CFLAGS="-fPIC" ;; *) - case "$arch" in - alpha|sparc|sparc64) - SHLIB_CFLAGS="-fPIC" - ;; - *) - SHLIB_CFLAGS="-fpic" - ;; - esac - SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - if test $doRpath = yes; then : - - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' -fi - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' - LDFLAGS="-Wl,-export-dynamic" - ;; - esac - case "$arch" in - vax) - CFLAGS_OPTIMIZE="-O1" - ;; - sh) - CFLAGS_OPTIMIZE="-O0" - ;; - *) - CFLAGS_OPTIMIZE="-O2" + SHLIB_CFLAGS="-fpic" ;; esac + SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' + SHLIB_SUFFIX=".so" + if test $doRpath = yes; then : + + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +fi + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' + LDFLAGS="-Wl,-export-dynamic" + CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then : # On OpenBSD: Compile with -pthread |