]> git.neil.brown.name Git - history.git/commitdiff
Fixed a bug caused by moving the location of the include of the
authorJeff Dike <jdike@uml.karaya.com>
Tue, 15 Oct 2002 07:09:15 +0000 (03:09 -0400)
committerJeff Dike <jdike@uml.karaya.com>
Tue, 15 Oct 2002 07:09:15 +0000 (03:09 -0400)
arch and os Makefiles.

arch/um/Makefile
arch/um/Makefile-i386

index 407dc4d4b8bca0fdada9046e7a51789ba2d0cf65..c519b3a7524683917d9025908069dce6c818ff21 100644 (file)
@@ -43,9 +43,8 @@ ARCH_INCLUDE = $(TOPDIR)/$(ARCH_DIR)/include
 # in CFLAGS.  Otherwise, it would cause ld to complain about the two different
 # errnos.
 
-CFLAGS += $(DEBUG) $(PROFILE) $(ARCH_CFLAGS) -D__arch_um__ \
-       -DSUBARCH=\"$(SUBARCH)\" -D_LARGEFILE64_SOURCE -I$(ARCH_INCLUDE) \
-       -Derrno=kernel_errno
+CFLAGS += $(DEBUG) $(PROFILE) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
+       -D_LARGEFILE64_SOURCE -I$(ARCH_INCLUDE) -Derrno=kernel_errno
 
 LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
 
index b3cfd27e415d7aabe78e03e91b0ba33abd6e3896..655fc0bf3827a4b032c3a06cf3be8d10219f6e19 100644 (file)
@@ -4,7 +4,7 @@ else
 TOP_ADDR = 0xc0000000
 endif
 
-ARCH_CFLAGS = -U__$(SUBARCH)__ -U$(SUBARCH)
+CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
 ELF_ARCH = $(SUBARCH)
 ELF_FORMAT = elf32-$(SUBARCH)