summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarnd@arndb.de <arnd@arndb.de>2003-11-24 22:10:23 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:13:02 -0700
commit74894b53f8f9f4de6f269a5c0c0f8ea03baa1587 (patch)
tree14a5e1ded74e824cf84582e2c2d24dd9f2c7393c
parentfee6f4150d0d5fbfc1ba74130bac1ae21ce69c81 (diff)
[PATCH] klibc makefile fixes
-rw-r--r--Makefile10
-rw-r--r--tdb/tdb.h1
2 files changed, 8 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index af181fe24a..d0c00aa88c 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ udevdir = ${prefix}/udev/
# to compile vs uClibc, that can be done here as well.
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
CC = $(CROSS)gcc
+LD = $(CROSS)gcc
AR = $(CROSS)ar
STRIP = $(CROSS)strip
RANLIB = $(CROSS)ranlib
@@ -109,6 +110,7 @@ endif
ifeq ($(strip $(KLIBC)),true)
KLIBC_DIR = klibc/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
+ include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
# arch specific objects
LIBGCC = $(shell $(CC) --print-libgcc)
ARCH_LIB_OBJS = \
@@ -117,8 +119,10 @@ ifeq ($(strip $(KLIBC)),true)
CRT0 = $(KLIBC_DIR)/crt0.o
- LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS)
- CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+ LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
+ CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(KLIBC_DIR)/arch/$(ARCH)/include \
+ -I$(INCLUDE_DIR)/bits$(BITSIZE) -I$(GCCINCDIR) -Iklibc/linux/include \
+ -D__KLIBC__
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles
else
@@ -169,7 +173,7 @@ udev_version.h:
$(ROOT): $(GEN_HEADERS) $(OBJS)
- $(CC) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+ $(LD) $(LDFLAGS) -o $(ROOT) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(STRIPCMD) $(ROOT)
clean:
diff --git a/tdb/tdb.h b/tdb/tdb.h
index 6f3b1ff756..e236b31af5 100644
--- a/tdb/tdb.h
+++ b/tdb/tdb.h
@@ -25,6 +25,7 @@
extern "C" {
#endif
+#include <signal.h>
/* flags to tdb_store() */
#define TDB_REPLACE 1