From: Andrey Borzenkov <arvidjaar@gmail.com>
Date: Sat, 16 Nov 2013 13:03:20 +0000 (+0400)
Subject: restore -nostdlib for libgcc symbols tests
X-Git-Tag: grub-2.02-beta1~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31c0cd43629b7395eb113e5679bd41dbebc1969c;p=thirdparty%2Fgrub.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index a74265abf..f8bcd188d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-16  Andrey Borzenkov <arvidjaar@gmail.com>
+
+	* configure.ac: Restore -nostdlib for libgcc symbols tests.
+
 2013-11-16  Andrey Borzenkov <arvidjaar@gmail.com>
 
 	* 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