OSDN Git Service

Do not prevent people from making mmu-less builds on mmu-full systems.
authorEric Andersen <andersen@codepoet.org>
Thu, 15 Aug 2002 12:54:54 +0000 (12:54 -0000)
committerEric Andersen <andersen@codepoet.org>
Thu, 15 Aug 2002 12:54:54 +0000 (12:54 -0000)
 -Erik

Makefile

index f5b8d4b..3a74626 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,11 @@ headers: dummy
            ln -fs $(KERNEL_SOURCE)/include/asm-h8300 include/asm; \
        else \
            if [ $(HAS_MMU) != "true" ]; then \
+                       if [ -d $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH)nommu ] ; then \
                        ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH)nommu include/asm;\
+                       else \
+                       ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \
+                       fi; \
                else \
                        ln -fs $(KERNEL_SOURCE)/include/asm-$(TARGET_ARCH) include/asm; \
                fi; \
@@ -102,13 +106,6 @@ headers: dummy
            echo " "; \
            /bin/false; \
        fi;
-       @if [ $(HAS_MMU) != "true" -a $(TARGET_ARCH) = "i386" ] ; then \
-           set -e; \
-           echo "WARNING: I bet your x86 system really has an MMU, right?"; \
-           echo "         malloc and friends won't work unless you fix \`Config'"; \
-           echo " "; \
-           sleep 10; \
-       fi;
        rm -f include/linux include/scsi
        ln -fs $(KERNEL_SOURCE)/include/linux include/linux
        ln -fs $(KERNEL_SOURCE)/include/scsi include/scsi