vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* grub-core/Makefile.am: Override STRIP and RANLIB. 

* configure.ac: compute TARGET_RANLIB.
	* INSTALL: Document TARGET_RANLIB

	Based on patches from AROS.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-09-23 12:55:18 +02:00
parent 3f7d9c8280
commit 0e8daad0bd
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2013-09-23 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/Makefile.am: Override STRIP and RANLIB.
* configure.ac: compute TARGET_RANLIB.
* INSTALL: Document TARGET_RANLIB
Based on patches from AROS.
2013-09-23 Vladimir Serbinenko <phcoder@gmail.com> 2013-09-23 Vladimir Serbinenko <phcoder@gmail.com>
* util/getroot.c (grub_util_biosdisk_get_grub_dev): Do not assume * util/getroot.c (grub_util_biosdisk_get_grub_dev): Do not assume

3
INSTALL
View File

@ -140,7 +140,7 @@ CC=amd64-linux-gnu-gcc CFLAGS="-g -O2" FREETYPE=amd64-linux-gnu-freetype-config
--target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc --target=arm --with-platform=uboot TARGET_CC=arm-elf-gcc
TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6" TARGET_CFLAGS="-Os -march=armv6" TARGET_CCASFLAGS="-march=armv6"
TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip" TARGET_OBJCOPY="arm-elf-objcopy" TARGET_STRIP="arm-elf-strip"
TARGET_NM=arm-elf-nm LEX=gflex TARGET_NM=arm-elf-nm TARGET_RANLIB=arm-elf-ranlib LEX=gflex
You need to use following options to specify tools and platforms. For minimum You need to use following options to specify tools and platforms. For minimum
version look at prerequisites. All tools not mentioned in this section under version look at prerequisites. All tools not mentioned in this section under
@ -177,6 +177,7 @@ corresponding platform are not needed for the platform in question.
8. TARGET_OBJCOPY= for objcopy for target. 8. TARGET_OBJCOPY= for objcopy for target.
9. TARGET_STRIP= for strip for target. 9. TARGET_STRIP= for strip for target.
10. TARGET_NM= for nm for target. 10. TARGET_NM= for nm for target.
11. TARGET_RANLIB= for ranlib for target.
- Additionally for emu, for host and target. - Additionally for emu, for host and target.
1. SDL is looked for in stadard linker directories (-lSDL) (optional) 1. SDL is looked for in stadard linker directories (-lSDL) (optional)

2
configure.ac
View File

@ -422,6 +422,7 @@ if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
AC_CHECK_TOOL(TARGET_OBJCOPY, objcopy) AC_CHECK_TOOL(TARGET_OBJCOPY, objcopy)
AC_CHECK_TOOL(TARGET_STRIP, strip) AC_CHECK_TOOL(TARGET_STRIP, strip)
AC_CHECK_TOOL(TARGET_NM, nm) AC_CHECK_TOOL(TARGET_NM, nm)
AC_CHECK_TOOL(TARGET_RANLIB, ranlib)
ac_tool_prefix="$tmp_ac_tool_prefix" ac_tool_prefix="$tmp_ac_tool_prefix"
else else
@ -431,6 +432,7 @@ else
AC_CHECK_TOOL(TARGET_OBJCOPY, objcopy) AC_CHECK_TOOL(TARGET_OBJCOPY, objcopy)
AC_CHECK_TOOL(TARGET_STRIP, strip) AC_CHECK_TOOL(TARGET_STRIP, strip)
AC_CHECK_TOOL(TARGET_NM, nm) AC_CHECK_TOOL(TARGET_NM, nm)
AC_CHECK_TOOL(TARGET_RANLIB, ranlib)
fi fi
AC_SUBST(HOST_CC) AC_SUBST(HOST_CC)

2
grub-core/Makefile.am
View File

@ -7,6 +7,8 @@ include $(top_srcdir)/conf/Makefile.common
CC=$(TARGET_CC) CC=$(TARGET_CC)
CPP=$(TARGET_CC) CPP=$(TARGET_CC)
CCAS=$(TARGET_CC) CCAS=$(TARGET_CC)
RANLIB=$(TARGET_RANLIB)
STRIP=$(TARGET_STRIP)
if COND_HAVE_FONT_SOURCE if COND_HAVE_FONT_SOURCE
TARGET_CFLAGS += -DUSE_ASCII_FALLBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1 TARGET_CFLAGS += -DUSE_ASCII_FALLBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1