summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2004-10-20 11:59:11 +0200
committerGreg KH <gregkh@suse.de>2005-04-26 22:06:44 -0700
commitf8c1ccde6aaf08c858616c9a8a83c06d609f52f5 (patch)
tree84272b3304984da52c70480f8c746057f965b216 /Makefile
parent5cab7caa2a767b16211c15f0051a2e21a96ebfd9 (diff)
[PATCH] improve klibc fixup integration
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile25
1 files changed, 14 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 4d25aee73e..19dc72d952 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ endif
# link udev against it statically.
# Otherwise, use glibc and link dynamically.
ifeq ($(strip $(USE_KLIBC)),true)
+ KLIBC_FIXUPS_DIR= $(PWD)/klibc_fixups
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_BASE)/include
@@ -149,13 +150,15 @@ ifeq ($(strip $(USE_KLIBC)),true)
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
- CFLAGS += $(WARNINGS) -nostdinc \
- $(OPTFLAGS) \
- -D__KLIBC__ -fno-builtin-printf \
- -I$(INCLUDE_DIR) \
- -I$(INCLUDE_DIR)/arch/$(ARCH) \
- -I$(INCLUDE_DIR)/bits$(BITSIZE) \
- -I$(GCCINCDIR) \
+ CFLAGS += $(WARNINGS) -nostdinc \
+ $(OPTFLAGS) \
+ -D__KLIBC__ -fno-builtin-printf \
+ -I$(KLIBC_FIXUPS_DIR) \
+ -include $(KLIBC_FIXUPS_DIR)/klibc_fixups.h \
+ -I$(INCLUDE_DIR) \
+ -I$(INCLUDE_DIR)/arch/$(ARCH) \
+ -I$(INCLUDE_DIR)/bits$(BITSIZE) \
+ -I$(GCCINCDIR) \
-I$(LINUX_INCLUDE_DIR)
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
@@ -226,14 +229,14 @@ HEADERS = udev.h \
udev_version.h \
udevdb.h \
udev_sysfs.h \
- klibc_fixups.h \
logging.h \
selinux.h \
- list.h
+ list.h \
+ klibc_fixups/klibc_fixups.h
ifeq ($(strip $(USE_KLIBC)),true)
- OBJS += klibc_fixups.o
- KLIBC_FIXUP = klibc_fixups.o
+ OBJS += klibc_fixups/klibc_fixups.o
+ KLIBC_FIXUP = klibc_fixups/klibc_fixups.o
endif
ifeq ($(strip $(V)),false)