* doc/Makefile.am (kernel_LDFLAGS): Add -m32.

(kernel_CFLAGS): Changed from this ...
	(kernel_CPPFLAGS): ... to this.
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-10-22 23:30:35 +02:00
1 parent f416453ad6
commit 66fe504794
2 files changed
+8 -2

No files matched your search

+6
View File
@@ -1,3 +1,9 @@
2010-10-22 Vladimir Serbinenko <phcoder@gmail.com>
* doc/Makefile.am (kernel_LDFLAGS): Add -m32.
(kernel_CFLAGS): Changed from this ...
(kernel_CPPFLAGS): ... to this.
2010-10-22 Vladimir Serbinenko <phcoder@gmail.com> 2010-10-22 Vladimir Serbinenko <phcoder@gmail.com>
* doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB * doc/multiboot.h (multiboot_apm_info): Use multiboot and not GRUB
+2 -2
View File
@@ -10,9 +10,9 @@ pkginclude_HEADERS = multiboot.h
if BUILD_EXAMPLE_KERNEL if BUILD_EXAMPLE_KERNEL
noinst_PROGRAMS = kernel noinst_PROGRAMS = kernel
kernel_SOURCES = $(EXAMPLES) 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 -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 boot.o: multiboot.h
endif endif