From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 15:41:57 +0000 (+0100)
Subject: Merge mainline into cleanbuild
X-Git-Tag: 1.99~1014^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=120cc3eebcddce42f21c039e4f12a704744f9578;p=thirdparty%2Fgrub.git

Merge mainline into cleanbuild
---

120cc3eebcddce42f21c039e4f12a704744f9578
diff --cc conf/any-emu.rmk
index c06e7758a,2ded20e2e..95f44844c
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -1,7 -1,11 +1,8 @@@
  # -*- makefile -*-
  
+ COMMON_LDFLAGS += -nostdlib
  COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
  
 -# Used by various components.  These rules need to precede them.
 -script/lexer.c_DEPENDENCIES = grub_script.tab.h
 -
  util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
  kernel_img_RELOCATABLE = yes
  pkglib_PROGRAMS = kernel.img