summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-02-19 18:03:38 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-02-19 18:03:38 +0000
commita746bfe6bb459b55b57502a03e773b25d2375c0a (patch)
tree75a9d6fe01466556726b0d2176536e55db2baf27
parent97f733d69b6912f7b0a9eb3664140c10884ffef6 (diff)
downloaddrakx-a746bfe6bb459b55b57502a03e773b25d2375c0a.tar
drakx-a746bfe6bb459b55b57502a03e773b25d2375c0a.tar.gz
drakx-a746bfe6bb459b55b57502a03e773b25d2375c0a.tar.bz2
drakx-a746bfe6bb459b55b57502a03e773b25d2375c0a.tar.xz
drakx-a746bfe6bb459b55b57502a03e773b25d2375c0a.zip
Enable all usual stage1-* BINS on x86-64. Add dietlibc to DIRS too for that
arch. Fix rescue-gui build with $(DIET) wrapper.
-rw-r--r--mdk-stage1/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 430175eac..1f8e2e731 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -160,6 +160,9 @@ BINS = init stage1-full
ifeq (i386, $(ARCH))
BINS += stage1-cdrom stage1-disk stage1-network stage1-usb
endif
+ifeq (x86_64, $(ARCH))
+BINS += stage1-cdrom stage1-disk stage1-network stage1-usb
+endif
ifeq (i386, $(ARCH))
DIRS = dietlibc
@@ -167,7 +170,10 @@ endif
ifeq (ppc, $(ARCH))
DIRS = dietlibc
endif
-DIRS += bzlib mar pci-resource usb-resource $(INSMOD) slang newt
+ifeq (x86_64, $(ARCH))
+DIRS = dietlibc
+endif
+DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt
ifneq (x86_64, $(ARCH))
DIRS += ppp/pppd rp-pppoe/src
endif
@@ -254,7 +260,7 @@ tar-mkinitrd_helper: clean
rm -rf mkinitrd_helper-subdir
rescue-gui: rescue-gui.o frontend-common.o $(FRONTEND_LINK) $(STAGE1_LIBC)
- $(CC) $(LDFLAGS_STAGE1) -o $@ $^
+ $(DIET) $(CC) $(LDFLAGS_STAGE1) -o $@ $^
$(STRIPCMD) $@