diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-11 16:13:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-11-11 16:13:56 (GMT) |
| commit | 52a3eade6bfe284dddc57cd47d11b18c24e9cf6a (patch) | |
| tree | 91ee30c2bb447e01b5db37b824189d393e90df7c | |
| parent | 36e74b9e8d9617fef6cde92fcc36e8f17d83d8b7 (diff) | |
| parent | fdf25d3a1ff7c15871780436f20436811fedf0cf (diff) | |
| download | tcl-52a3eade6bfe284dddc57cd47d11b18c24e9cf6a.zip tcl-52a3eade6bfe284dddc57cd47d11b18c24e9cf6a.tar.gz tcl-52a3eade6bfe284dddc57cd47d11b18c24e9cf6a.tar.bz2 | |
Merge 8.6
| -rwxr-xr-x | win/configure | 35 | ||||
| -rw-r--r-- | win/tcl.m4 | 13 |
2 files changed, 48 insertions, 0 deletions
diff --git a/win/configure b/win/configure index 54ce90b..96f92d2 100755 --- a/win/configure +++ b/win/configure @@ -4283,6 +4283,7 @@ printf "%s\n" "$ac_cv_municode" >&6; } else extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS" fi + hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -fno-lto" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working -fno-lto" >&5 printf %s "checking for working -fno-lto... " >&6; } if test ${ac_cv_nolto+y} @@ -4352,6 +4353,40 @@ printf "%s\n" "$tcl_cv_cc_input_charset" >&6; } fi fi + hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Wl,--enable-auto-image-base" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working --enable-auto-image-base" >&5 +printf %s "checking for working --enable-auto-image-base... " >&6; } +if test ${ac_cv_enable_auto_image_base+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_enable_auto_image_base=yes +else $as_nop + ac_cv_enable_auto_image_base=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_enable_auto_image_base" >&5 +printf "%s\n" "$ac_cv_enable_auto_image_base" >&6; } + CFLAGS=$hold_cflags + if test "$ac_cv_enable_auto_image_base" == "yes" ; then + extra_ldflags="$extra_ldflags -Wl,--enable-auto-image-base" + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler flags" >&5 printf %s "checking compiler flags... " >&6; } if test "${GCC}" = "yes" ; then @@ -603,6 +603,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([])], @@ -625,6 +626,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="" |