summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/Makefile8
-rw-r--r--mdk-stage1/Makefile.common2
2 files changed, 2 insertions, 8 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index d370aab4a..c4550e8a5 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -107,11 +107,7 @@ STAGE1_OWN_LIBS = $(INSMOD)/libinsmod.a mar/libmar.a bzlib/libbzlib.a
ifeq (DIETLIBC, $(L))
STAGE1_NETWORK_LIBS = $(top_dir)/dietlibc/bin-$(ARCH)/librpc.a
else
-ifeq (x86_64, $(ARCH))
STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a
-else
-STAGE1_NETWORK_LIBS = /usr/lib/libresolv.a
-endif
endif
#- stage1 itself
@@ -146,9 +142,9 @@ ifeq (x86_64, $(ARCH))
LDFLAGS_INIT = -static -nostdlib /usr/$(LIB)/crt1.o
else
ifeq (ia64, $(ARCH))
-LDFLAGS_INIT = $(GLIBC_LDFLAGS_STAGE1)
+LDFLAGS_INIT = -static
else
-LDFLAGS_INIT = $(DIETLIBC_LDFLAGS_STAGE1)
+LDFLAGS_INIT = -nostdlib
endif
endif
endif
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common
index 56494bb5e..d16c260e4 100644
--- a/mdk-stage1/Makefile.common
+++ b/mdk-stage1/Makefile.common
@@ -49,8 +49,6 @@ DIETLIBC_INCLUDES = -I$(top_dir)/dietlibc/include -I. -I$(top_dir)/bzlib
GLIBC_INCLUDES = -I. -I$(top_dir)/bzlib
INCLUDES = $($(L)_INCLUDES)
-GLIBC_LDFLAGS_STAGE1 = -static
-DIETLIBC_LDFLAGS_STAGE1 = -nostdlib
LDFLAGS_STAGE1 = $($(L)_LDFLAGS_STAGE1)
STAGE1_LIBC = $($(L)_LIBC)