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

fix for cygwin build

This commit is contained in:
BVK Chaitanya 2010-06-04 16:48:42 +05:30
parent b89561390c
commit d3ff5a05eb
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -42,11 +42,11 @@ AC_PREREQ(2.60)
AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
AC_CONFIG_HEADER([config.h])
m4_include([configure.common])
grub_coredir='grub-core'
AC_SUBST(grub_coredir)
m4_include([configure.common])
# Output files.
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([po/Makefile])

6
configure.common
View File

@ -356,10 +356,10 @@ if test x$grub_cv_apple_target_cc = xyes ; then
else
TARGET_APPLE_CC=0
# Use linker script if present, otherwise use builtin -N script.
if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
if test -f "${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT} -Wl,-Ttext,"
TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc -Wl,-Ttext,"
TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc -Wl,-Ttext,"
else
TARGET_IMG_LDSCRIPT=
TARGET_IMG_LDFLAGS='-Wl,-N -Wl,-Ttext,'

1
grub-core/Makefile.am
View File

@ -6,6 +6,7 @@ EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
include $(top_srcdir)/Makefile.vars

6
grub-core/configure.ac
View File

@ -42,15 +42,15 @@ AC_PREREQ(2.60)
AC_CONFIG_SRCDIR([include/grub/dl.h])
AC_CONFIG_HEADER([config.h])
grub_coredir='.'
AC_SUBST(grub_coredir)
m4_include([configure.common])
CC=$TARGET_CC
CPP=$TARGET_CC
CCAS=$TARGET_CC
grub_coredir='.'
AC_SUBST(grub_coredir)
# Output files.
grub_CHECK_LINK_DIR
if test x"$link_dir" = xyes ; then