summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/Makefile.common
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-19 19:17:28 +0100
committerColin Guthrie <colin@mageia.org>2013-10-29 20:25:59 +0000
commit4f1bb300b5488d0d36fafc53ebb0969e51b44b8a (patch)
treeb8ad3db5d167512ba119169061e8fc408989e508 /mdk-stage1/Makefile.common
parentacc1cc950e31bd02fda968bb6c40f85efa7bc3a2 (diff)
downloaddrakx-4f1bb300b5488d0d36fafc53ebb0969e51b44b8a.tar
drakx-4f1bb300b5488d0d36fafc53ebb0969e51b44b8a.tar.gz
drakx-4f1bb300b5488d0d36fafc53ebb0969e51b44b8a.tar.bz2
drakx-4f1bb300b5488d0d36fafc53ebb0969e51b44b8a.tar.xz
drakx-4f1bb300b5488d0d36fafc53ebb0969e51b44b8a.zip
stage1: Switch to a shared stage1.
Previously we would create a static stage1 for the installer, but as a dracut based initrd already includes glibc, there is very little advantage in this small, statically linked version. As a side note, it seems that if the initrd contains a /etc/modprobe.d/ folder (which can be the case with dracut) then dietlibc seems to return a ENOENT when calling readdir_r() on that folder (via the libkmod-config.c code).
Diffstat (limited to 'mdk-stage1/Makefile.common')
-rw-r--r--mdk-stage1/Makefile.common13
1 files changed, 6 insertions, 7 deletions
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index 34c010905..d225da69e 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -28,12 +28,12 @@ F = NEWT
endif
# diet libc syscalls are broken on mips
-ifneq (mips, $(ARCH))
-# diet libc eabi support is mostly broken
-ifneq (arm, $(ARCH))
-DIET = $(shell test -x /usr/bin/diet && echo diet)
-endif
-endif
+#ifneq (mips, $(ARCH))
+## diet libc eabi support is mostly broken
+#ifneq (arm, $(ARCH))
+#DIET = $(shell test -x /usr/bin/diet && echo diet)
+#endif
+#endif
ifeq ($(DIET), diet)
@@ -63,7 +63,6 @@ DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a
GLIBC_INCLUDES = -I.
INCLUDES = $($(L)_INCLUDES)
-GLIBC_LDFLAGS = -static
LDFLAGS = $($(L)_LDFLAGS)
STAGE1_LIBC = $($(L)_LIBC)