diff options
| author | cvs2fossil <cvs2fossil> | 2010-12-17 17:55:45 (GMT) |
|---|---|---|
| committer | cvs2fossil <cvs2fossil> | 2010-12-17 17:55:45 (GMT) |
| commit | 42ec8b1131aa68f91d67124d508d02a79844a117 (patch) | |
| tree | 204a2107d1e2576f7c3e2c7006e5ac0dbd74a670 /unix/configure | |
| parent | 0440538b7ad50dd5141f92d24036f7ad45c799f7 (diff) | |
| download | tcl-dogeen_assembler_merge.zip tcl-dogeen_assembler_merge.tar.gz tcl-dogeen_assembler_merge.tar.bz2 | |
Created branch dogeen-assembler-merge-syntheticdogeen_assembler_mergedogeen_assembler_merge_synthetic
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 51 |
1 files changed, 13 insertions, 38 deletions
diff --git a/unix/configure b/unix/configure index 5debd0a..04f77d4 100755 --- a/unix/configure +++ b/unix/configure @@ -6545,11 +6545,6 @@ echo "${ECHO_T}$tcl_cv_cc_visibility_hidden" >&6 else - -cat >>confdefs.h <<\_ACEOF -#define NO_VIZ -_ACEOF - hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -7723,40 +7718,20 @@ fi TCL_LIB_VERSIONS_OK=nodots ;; OpenBSD-*) - arch=`arch -s` - case "$arch" in - m88k|vax) - # Equivalent using configure option --disable-load - # Step 4 will set the necessary variables - DL_OBJS="" - ;; - *) - SHLIB_CFLAGS="-fPIC" - SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' - SHLIB_LD_LIBS='${LIBS}' - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" - if test $doRpath = yes; then + CFLAGS_OPTIMIZE='-O2' + SHLIB_CFLAGS="-fPIC" + SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + if test $doRpath = yes; then - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' fi - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' - ;; - esac - case "$arch" in - m88k|vax) - CFLAGS_OPTIMIZE="-O1" - ;; - sh) - CFLAGS_OPTIMIZE="-O0" - ;; - *) - CFLAGS_OPTIMIZE="-O2" - ;; - esac + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' echo "$as_me:$LINENO: checking for ELF" >&5 echo $ECHO_N "checking for ELF... $ECHO_C" >&6 if test "${tcl_cv_ld_elf+set}" = set; then @@ -7796,10 +7771,10 @@ fi if test "${TCL_THREADS}" = "1"; then - # On OpenBSD: Compile with -pthread - # Don't link with -lpthread + # OpenBSD builds and links with -pthread, never -lpthread. LIBS=`echo $LIBS | sed s/-lpthread//` CFLAGS="$CFLAGS -pthread" + SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread" fi |