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

2009-02-08 Robert Millan <rmh@aybabtu.com>

Browse source 
* Makefile.in (host_os, host_cpu): New variables.
        (target_os): Remove.  Update all users.
This commit is contained in:
robertmh 2009-02-08 19:59:32 +00:00
parent d64399b562
commit 56978920b1
6 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-02-08 Robert Millan <rmh@aybabtu.com>
* Makefile.in (host_os, host_cpu): New variables.
(target_os): Remove. Update all users.
2009-02-08 Marco Gerards <marco@gnu.org> 2009-02-08 Marco Gerards <marco@gnu.org>
* Makefile.in (enable_grub_emu_usb): New variable. * Makefile.in (enable_grub_emu_usb): New variable.

4
Makefile.in
View file

@ -47,8 +47,10 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
host_os = @host_os@
host_cpu = @host_cpu@
target_cpu = @target_cpu@ target_cpu = @target_cpu@
target_os = @target_os@
platform = @platform@ platform = @platform@
INSTALL = @INSTALL@ INSTALL = @INSTALL@

2
conf/common.mk
View file

@ -579,7 +579,7 @@ CLEANFILES += update-grub_lib
./config.status --file=$@:$< ./config.status --file=$@:$<
chmod +x $@ chmod +x $@
grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 10_freebsd 30_os-prober 40_custom grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 10_freebsd 30_os-prober 40_custom
ifeq ($(target_os), cygwin) ifeq ($(host_os), cygwin)
grub-mkconfig_SCRIPTS += 10_windows grub-mkconfig_SCRIPTS += 10_windows
endif endif

2
conf/common.rmk
View file

@ -146,7 +146,7 @@ CLEANFILES += update-grub_lib
./config.status --file=$@:$< ./config.status --file=$@:$<
chmod +x $@ chmod +x $@
grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 10_freebsd 30_os-prober 40_custom grub-mkconfig_SCRIPTS = 00_header 10_linux 10_hurd 10_freebsd 30_os-prober 40_custom
ifeq ($(target_os), cygwin) ifeq ($(host_os), cygwin)
grub-mkconfig_SCRIPTS += 10_windows grub-mkconfig_SCRIPTS += 10_windows
endif endif

14
configure vendored
View file

@ -2006,9 +2006,7 @@ case "$host_os" in
mingw32) host_os=cygwin ;; mingw32) host_os=cygwin ;;
esac esac
case "$target_os" in
mingw32) target_os=cygwin ;;
esac
@ -5906,10 +5904,10 @@ done
# Use linker script if present, otherwise use builtin -N script. # Use linker script if present, otherwise use builtin -N script.
{ echo "$as_me:$LINENO: checking for option to link raw image" >&5 { echo "$as_me:$LINENO: checking for option to link raw image" >&5
echo $ECHO_N "checking for option to link raw image... $ECHO_C" >&6; } echo $ECHO_N "checking for option to link raw image... $ECHO_C" >&6; }
if test -f "${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"; then if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc" TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}" TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc" TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
else else
TARGET_IMG_LDSCRIPT= TARGET_IMG_LDSCRIPT=
TARGET_IMG_LDFLAGS='-Wl,-N' TARGET_IMG_LDFLAGS='-Wl,-N'
@ -5923,8 +5921,8 @@ echo "${ECHO_T}$TARGET_IMG_LDFLAGS_AC" >&6; }
# For platforms where ELF is not the default link format. # For platforms where ELF is not the default link format.
{ echo "$as_me:$LINENO: checking for command to convert module to ELF format" >&5 { echo "$as_me:$LINENO: checking for command to convert module to ELF format" >&5
echo $ECHO_N "checking for command to convert module to ELF format... $ECHO_C" >&6; } echo $ECHO_N "checking for command to convert module to ELF format... $ECHO_C" >&6; }
case "${host_os}:${target_os}" in case "${host_os}" in
cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;; cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
*) ;; *) ;;
esac esac

16
configure.ac
View file

@ -103,12 +103,10 @@ case "$host_os" in
mingw32) host_os=cygwin ;; mingw32) host_os=cygwin ;;
esac esac
case "$target_os" in AC_SUBST(host_cpu)
mingw32) target_os=cygwin ;; AC_SUBST(host_os)
esac
AC_SUBST(target_cpu) AC_SUBST(target_cpu)
AC_SUBST(target_os)
AC_SUBST(platform) AC_SUBST(platform)
# #
@ -200,10 +198,10 @@ AC_CHECK_FUNCS(posix_memalign memalign asprintf)
# Use linker script if present, otherwise use builtin -N script. # Use linker script if present, otherwise use builtin -N script.
AC_MSG_CHECKING([for option to link raw image]) AC_MSG_CHECKING([for option to link raw image])
if test -f "${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc"; then if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc" TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}" TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${target_os}-img-ld.sc" TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
else else
TARGET_IMG_LDSCRIPT= TARGET_IMG_LDSCRIPT=
TARGET_IMG_LDFLAGS='-Wl,-N' TARGET_IMG_LDFLAGS='-Wl,-N'
@ -215,8 +213,8 @@ AC_MSG_RESULT([$TARGET_IMG_LDFLAGS_AC])
# For platforms where ELF is not the default link format. # For platforms where ELF is not the default link format.
AC_MSG_CHECKING([for command to convert module to ELF format]) AC_MSG_CHECKING([for command to convert module to ELF format])
case "${host_os}:${target_os}" in case "${host_os}" in
cygwin:cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;; cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
*) ;; *) ;;
esac esac
AC_SUBST(TARGET_OBJ2ELF) AC_SUBST(TARGET_OBJ2ELF)