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

2006-05-31 Jeroen Dekkers <jeroen@dekkers.cx>

Browse source 
* configure.ac: Don't set host_m32 for x86_64. Also reset LIBS
	for the target-specific tests. Make sure that we also have the
	up-to-date target variables for those tests.
This commit is contained in:
jeroen 2006-06-01 15:51:51 +00:00
parent 26c607b932
commit aa6d782629
4 changed files with 3046 additions and 2491 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-05-31 Jeroen Dekkers <jeroen@dekkers.cx>
* configure.ac: Don't set host_m32 for x86_64. Also reset LIBS
for the target-specific tests. Make sure that we also have the
up-to-date target variables for those tests.
2006-05-31 Yoshinori K. Okuji <okuji@enbug.org> 2006-05-31 Yoshinori K. Okuji <okuji@enbug.org>
* genmk.rb (Image::rule): Prefix CFLAGS or ASFLAGS with TARGET_. * genmk.rb (Image::rule): Prefix CFLAGS or ASFLAGS with TARGET_.

4
config.h.in
View file

@ -82,10 +82,10 @@
/* Define to the version of this package. */ /* Define to the version of this package. */
#undef PACKAGE_VERSION #undef PACKAGE_VERSION
/* The size of a `long', as computed by sizeof. */ /* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG #undef SIZEOF_LONG
/* The size of a `void *', as computed by sizeof. */ /* The size of `void *', as computed by sizeof. */
#undef SIZEOF_VOID_P #undef SIZEOF_VOID_P
/* Define it to either start or _start */ /* Define it to either start or _start */

5517
configure vendored
View file

File diff suppressed because it is too large Load diff

10
configure.ac
View file

@ -41,7 +41,6 @@ AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
case "$host_cpu" in case "$host_cpu" in
x86_64) host_m32=1 ;;
powerpc64) host_m32=1 ;; powerpc64) host_m32=1 ;;
esac esac
@ -186,10 +185,12 @@ tmp_CC="$CC"
tmp_CFLAGS="$CFLAGS" tmp_CFLAGS="$CFLAGS"
tmp_LDFLAGS="$LDFLAGS" tmp_LDFLAGS="$LDFLAGS"
tmp_CPPFLAGS="$CPPFLAGS" tmp_CPPFLAGS="$CPPFLAGS"
tmp_LIBS="$LIBS"
CC="$TARGET_CC" CC="$TARGET_CC"
CFLAGS="$TARGET_CFLAGS" CFLAGS="$TARGET_CFLAGS"
CPPFLAGS="$TARGET_CPPFLAGS" CPPFLAGS="$TARGET_CPPFLAGS"
LDFLAGS="$TARGET_LDFLAGS" LDFLAGS="$TARGET_LDFLAGS"
LIBS=""
if test "x$TARGET_CFLAGS" = x; then if test "x$TARGET_CFLAGS" = x; then
# debug flags. # debug flags.
@ -232,6 +233,12 @@ AC_SUBST(TARGET_CFLAGS)
AC_SUBST(TARGET_CPPFLAGS) AC_SUBST(TARGET_CPPFLAGS)
AC_SUBST(TARGET_LDFLAGS) AC_SUBST(TARGET_LDFLAGS)
# Set them to their new values for the tests below.
CC="$TARGET_CC"
CFLAGS="$TARGET_CFLAGS"
CPPFLAGS="$TARGET_CPPFLAGS"
LDFLAGS="$TARGET_LDFLAGS"
# Defined in aclocal.m4. # Defined in aclocal.m4.
grub_PROG_OBJCOPY_ABSOLUTE grub_PROG_OBJCOPY_ABSOLUTE
grub_ASM_USCORE grub_ASM_USCORE
@ -252,6 +259,7 @@ CC="$tmp_CC"
CFLAGS="$tmp_CFLAGS" CFLAGS="$tmp_CFLAGS"
CPPFLAGS="$tmp_CPPFLAGS" CPPFLAGS="$tmp_CPPFLAGS"
LDFLAGS="$tmp_LDFLAGS" LDFLAGS="$tmp_LDFLAGS"
LIBS="$tmp_LIBS"
# Check for options. # Check for options.
AC_ARG_ENABLE([mm-debug], AC_ARG_ENABLE([mm-debug],