diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-11 16:12:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-11 16:12:24 (GMT) |
| commit | fdf25d3a1ff7c15871780436f20436811fedf0cf (patch) | |
| tree | 824949a08f678d7a7a61a201f31902e7cefe2cc4 /win/tcl.m4 | |
| parent | 4d0be555a4f1ed502289bf66a443422adbad2070 (diff) | |
| download | tcl-fdf25d3a1ff7c15871780436f20436811fedf0cf.zip tcl-fdf25d3a1ff7c15871780436f20436811fedf0cf.tar.gz tcl-fdf25d3a1ff7c15871780436f20436811fedf0cf.tar.bz2 | |
Fix -fno-lto determination/add --enable-auto-image-base option to windows build (when available)
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -659,6 +659,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ else extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS" fi + hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -fno-lto" AC_CACHE_CHECK(for working -fno-lto, ac_cv_nolto, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], @@ -673,6 +674,18 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ fi fi + hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Wl,--enable-auto-image-base" + AC_CACHE_CHECK(for working --enable-auto-image-base, + ac_cv_enable_auto_image_base, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], + [ac_cv_enable_auto_image_base=yes], + [ac_cv_enable_auto_image_base=no]) + ) + CFLAGS=$hold_cflags + if test "$ac_cv_enable_auto_image_base" == "yes" ; then + extra_ldflags="$extra_ldflags -Wl,--enable-auto-image-base" + fi + AC_MSG_CHECKING([compiler flags]) if test "${GCC}" = "yes" ; then SHLIB_LD="" @@ -1204,7 +1217,7 @@ AC_DEFUN([SC_PROG_TCLSH], [ AC_DEFUN([SC_BUILD_TCLSH], [ AC_MSG_CHECKING([for tclsh in Tcl build directory]) - BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT} + BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}\${EXESUFFIX} AC_MSG_RESULT($BUILD_TCLSH) AC_SUBST(BUILD_TCLSH) ]) |