diff options
| author | stwo <stwo> | 2010-12-12 11:51:44 (GMT) |
|---|---|---|
| committer | stwo <stwo> | 2010-12-12 11:51:44 (GMT) |
| commit | 15b3fd3efd468b197e322191cb62d25baf556ab0 (patch) | |
| tree | acccadadc0e00e9a67d2fc980872e6ec41025cfc /unix/configure | |
| parent | 8bfe2a72f81586691fd3ddf6ff8b40b74aeb312d (diff) | |
| download | tcl-15b3fd3efd468b197e322191cb62d25baf556ab0.zip tcl-15b3fd3efd468b197e322191cb62d25baf556ab0.tar.gz tcl-15b3fd3efd468b197e322191cb62d25baf556ab0.tar.bz2 | |
Better building on OpenBSD.
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/unix/configure b/unix/configure index 04f77d4..816e681 100755 --- a/unix/configure +++ b/unix/configure @@ -7718,20 +7718,40 @@ fi TCL_LIB_VERSIONS_OK=nodots ;; OpenBSD-*) - 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 + 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 - 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}' + 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 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 @@ -7771,10 +7791,10 @@ fi if test "${TCL_THREADS}" = "1"; then - # OpenBSD builds and links with -pthread, never -lpthread. + # On OpenBSD: Compile with -pthread + # Don't link with -lpthread LIBS=`echo $LIBS | sed s/-lpthread//` CFLAGS="$CFLAGS -pthread" - SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread" fi |