From: Vladimir 'phcoder' Serbinenko Date: Fri, 22 Oct 2010 21:30:35 +0000 (+0200) Subject: * doc/Makefile.am (kernel_LDFLAGS): Add -m32. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66fe504794ad3c2fbe8fb94cbfd1be7451e7bf50;p=thirdparty%2Fgrub.git * doc/Makefile.am (kernel_LDFLAGS): Add -m32. (kernel_CFLAGS): Changed from this ... (kernel_CPPFLAGS): ... to this. --- diff --git a/ChangeLog b/ChangeLog index 9f14b7f65..4f976eec7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-22 Vladimir Serbinenko + + * doc/Makefile.am (kernel_LDFLAGS): Add -m32. + (kernel_CFLAGS): Changed from this ... + (kernel_CPPFLAGS): ... to this. + 2010-10-22 Vladimir Serbinenko * doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB diff --git a/doc/Makefile.am b/doc/Makefile.am index dd65301de..5ca878f54 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,9 +10,9 @@ pkginclude_HEADERS = multiboot.h if BUILD_EXAMPLE_KERNEL noinst_PROGRAMS = kernel kernel_SOURCES = $(EXAMPLES) -kernel_CFLAGS = -m32 -nostdlib -fno-builtin -nostdinc -O -g -Wall \ +kernel_CPPFLAGS = -m32 -nostdlib -fno-builtin -nostdinc -O -g -Wall \ -imacros $(top_builddir)/config.h -kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none +kernel_LDFLAGS = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none boot.o: multiboot.h endif