Skip to content

Commit c45b682

Browse files
committedAug 23, 2013
* configure.ac: Disable efiemu runtime on cygwin.
1 parent 952d64c commit c45b682

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed
 

‎ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2013-08-23 Vladimir Serbinenko <phcoder@gmail.com>
2+
3+
* configure.ac: Disable efiemu runtime on cygwin.
4+
15
2013-08-23 Vladimir Serbinenko <phcoder@gmail.com>
26

37
* conf/Makefile.extra-dist: Add missing util/grub-gen-asciih.c,

‎configure.ac

+16
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,19 @@ if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
496496
TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
497497
fi
498498

499+
if test x"$target_os" = xcygwin; then
500+
AC_CACHE_CHECK([whether option -fno-reorder-functions works], grub_cv_cc_no_reorder_functions, [
501+
CFLAGS="$CFLAGS -fno-reorder-functions"
502+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
503+
[grub_cv_cc_no_reorder_functions=yes],
504+
[grub_cv_cc_no_reorder_functions=no])
505+
])
506+
fi
507+
508+
if test x"$target_os" = xcygwin && test "x$grub_cv_cc_no_reorder_functions" = xyes; then
509+
TARGET_CFLAGS="$TARGET_CFLAGS -fno-reorder-functions"
510+
fi
511+
499512
# By default, GCC 4.6 generates .eh_frame sections containing unwind
500513
# information in some cases where it previously did not. GRUB doesn't need
501514
# these and they just use up vital space. Restore the old compiler
@@ -570,6 +583,9 @@ AC_ARG_ENABLE([efiemu],
570583
if test x"$enable_efiemu" = xno ; then
571584
efiemu_excuse="explicitly disabled"
572585
fi
586+
if test x"$target_os" = xcygwin ; then
587+
efiemu_excuse="not available on cygwin"
588+
fi
573589
if test x"$target_cpu" != xi386 ; then
574590
efiemu_excuse="only available on i386"
575591
fi

0 commit comments

Comments
 (0)