From 31c0cd43629b7395eb113e5679bd41dbebc1969c Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sat, 16 Nov 2013 17:03:20 +0400 Subject: [PATCH] restore -nostdlib for libgcc symbols tests Commit 24f4e57c4684471da088c504dec0380886eece0c plugged leakage of CFLAGS between individual tests, which broke test for libgcc symbols. It needs -nostdlib which was set in previous test and inherited before. Set it explicitly. --- ChangeLog | 4 ++++ configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a74265abf..f8bcd188d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-16 Andrey Borzenkov + + * configure.ac: Restore -nostdlib for libgcc symbols tests. + 2013-11-16 Andrey Borzenkov * docs/grub.texi (Environment): Document cmdpath. diff --git a/configure.ac b/configure.ac index 2c4f019f6..18429103b 100644 --- a/configure.ac +++ b/configure.ac @@ -815,9 +815,9 @@ LIBS="$TARGET_LIBGCC" grub_ASM_USCORE if test "x$TARGET_APPLE_LINKER" = x0 ; then if test x$grub_cv_asm_uscore = xyes; then -CFLAGS="$TARGET_CFLAGS -Wl,--defsym,_abort=_main" +CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,_abort=_main" else -CFLAGS="$TARGET_CFLAGS -Wl,--defsym,abort=main" +CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,abort=main" fi fi