chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38ebdca
)
[PATCH] pull some klibc stuff into the make Makefile to try to stay in sync.
author
greg@kroah.com
<greg@kroah.com>
Sat, 25 Oct 2003 07:21:18 +0000
(
00:21
-0700)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 04:06:22 +0000
(21:06 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 82ea0bc309214713fea08ed0e6d79797f0a0526e..8d7122858b3660df403a240643b563aecd3aefe6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-106,19
+106,22
@@
endif
# If we are using our version of klibc, then we need to build and link it.
# Otherwise, use glibc and link statically.
ifeq ($(strip $(KLIBC)),true)
# If we are using our version of klibc, then we need to build and link it.
# Otherwise, use glibc and link statically.
ifeq ($(strip $(KLIBC)),true)
- KLIBC_DIR = klibc
+ KLIBC_DIR = klibc
/klibc
INCLUDE_DIR := $(KLIBC_DIR)/include
# arch specific objects
INCLUDE_DIR := $(KLIBC_DIR)/include
# arch specific objects
+ LIBGCC = $(shell $(CC) --print-libgcc)
ARCH_LIB_OBJS = \
ARCH_LIB_OBJS = \
- $(KLIBC_DIR)/
bin-$(ARCH)/start.o
\
- $(
KLIBC_DIR)/bin-$(ARCH)/klibc.a
+ $(KLIBC_DIR)/
libc.a
\
+ $(
LIBGCC)
- LIB_OBJS = $(GCC_LIB)
+ CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS)
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS)
- CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(GCCINCDIR)
+ CFLAGS += -nostdinc -I$(INCLUDE_DIR) -I$(INCLUDE_DIR)/bits32 -I$(GCCINCDIR) -Iklibc/linux/include -D__KLIBC__
+ LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles
else
LDFLAGS = --static --nostdlib -nostartfiles
else
+ CRT0 =
LIBC =
CFLAGS += -I$(GCCINCDIR)
LIB_OBJS = -lc
LIBC =
CFLAGS += -I$(GCCINCDIR)
LIB_OBJS = -lc