summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-08-15 12:54:54 +0000
committerEric Andersen <andersen@codepoet.org>2002-08-15 12:54:54 +0000
commitd5bb6d12f1ffee55f3287cf92a59ed1d8100e737 (patch)
treef043de80f1c1754c57ac9876f82645f20ff44db8
parent6e58f3b7d4da5d1d3083a7dbccf60fe066439c01 (diff)
Do not prevent people from making mmu-less builds on mmu-full systems.
-Erik
-rw-r--r--Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f5b8d4b63..3a7462660 100644
--- 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