95 lines
4.1 KiB
Diff
95 lines
4.1 KiB
Diff
From 87682b6ad631272dfdc45e1c760331d803851c06 Mon Sep 17 00:00:00 2001
|
|
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
|
|
Date: Sat, 25 Jul 2009 15:12:43 +0200
|
|
Subject: [PATCH 03/18] Define and use $(STRIP) makefile variable
|
|
|
|
This increases readability and makes it easier to turn off stripping
|
|
of debug symbols.
|
|
---
|
|
Makefile | 21 +++++++++++----------
|
|
1 files changed, 11 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 8009cb4..dc23d1a 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -105,6 +105,7 @@ CROSS=
|
|
|
|
CC=gcc
|
|
INC=-I. -isystem include
|
|
+STRIP=$(CROSS)strip
|
|
|
|
VPATH=lib:libstdio:libugly:libcruft:libcrypt:libshell:liblatin1:libcompat:libdl:librpc:libregex:libm:profiling
|
|
|
|
@@ -161,7 +162,7 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
|
|
|
|
$(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
|
|
tcc -I. -Iinclude -c $< -o $@
|
|
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
|
|
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
|
|
else
|
|
$(OBJDIR)/pstart.o: start.S $(OBJDIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -DPROFILING -c $< -o $@
|
|
@@ -171,11 +172,11 @@ $(OBJDIR)/%.o: %.S $(ARCH)/syscalls.h $(OBJDIR)/.dirstamp
|
|
|
|
$(OBJDIR)/pthread_%.o: libpthread/pthread_%.c $(OBJDIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@
|
|
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
|
|
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
|
|
|
|
$(OBJDIR)/%.o: %.c $(OBJDIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -c $< -o $@ -D__dietlibc__
|
|
- $(COMMENT) -$(CROSS)strip -x -R .comment -R .note $@
|
|
+ $(COMMENT) -$(STRIP) -x -R .comment -R .note $@
|
|
endif
|
|
|
|
ifeq ($(shell $(CC) -v 2>&1 | grep "gcc version"),gcc version 4.0.0)
|
|
@@ -245,18 +246,18 @@ $(PICODIR)/%.o: %.S $(ARCH)/syscalls.h $(PICODIR)/.dirstamp
|
|
|
|
$(PICODIR)/pthread_%.o: libpthread/pthread_%.c $(PICODIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
|
|
- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
|
|
+ $(COMMENT) $(STRIP) -x -R .comment -R .note $@
|
|
|
|
$(PICODIR)/%.o: %.c $(PICODIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
|
|
- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
|
|
+ $(COMMENT) $(STRIP) -x -R .comment -R .note $@
|
|
|
|
$(PICODIR)/dstart.o: start.S $(PICODIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -c $< -o $@
|
|
|
|
$(PICODIR)/dyn_so_start.o: dyn_start.c $(PICODIR)/.dirstamp
|
|
$(CROSS)$(CC) $(INC) $(CFLAGS) -fPIC -D__DYN_LIB -D__DYN_LIB_SHARED -c $< -o $@
|
|
- $(COMMENT) $(CROSS)strip -x -R .comment -R .note $@
|
|
+ $(COMMENT) $(STRIP) -x -R .comment -R .note $@
|
|
|
|
DYN_LIBC_PIC = $(LIBOBJ) $(LIBSTDIOOBJ) $(LIBUGLYOBJ) \
|
|
$(LIBCRUFTOBJ) $(LIBCRYPTOBJ) $(LIBSHELLOBJ) $(LIBREGEXOBJ)
|
|
@@ -305,19 +306,19 @@ CURNAME=$(notdir $(shell pwd))
|
|
|
|
$(OBJDIR)/diet: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
|
|
$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -DVERSION=\"$(VERSION)\" -lgcc
|
|
- $(CROSS)strip -R .comment -R .note $@
|
|
+ $(STRIP) -R .comment -R .note $@
|
|
|
|
$(OBJDIR)/diet-i: $(OBJDIR)/start.o $(OBJDIR)/dyn_start.o diet.c $(OBJDIR)/dietlibc.a $(OBJDIR)/dyn_stop.o
|
|
$(CROSS)$(CC) -isystem include $(CFLAGS) -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -DVERSION=\"$(VERSION)\" -DINSTALLVERSION -lgcc
|
|
- $(CROSS)strip -R .comment -R .note $@
|
|
+ $(STRIP) -R .comment -R .note $@
|
|
|
|
$(PICODIR)/diet-dyn: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
|
|
$(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(HOME)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(HOME)/$(PICODIR)/libdl.so
|
|
- $(CROSS)strip -R .command -R .note $@
|
|
+ $(STRIP) -R .command -R .note $@
|
|
|
|
$(PICODIR)/diet-dyn-i: $(PICODIR)/start.o $(PICODIR)/dyn_start.o diet.c
|
|
$(LD_UNSET) $(CROSS)$(CC) -isystem include $(CFLAGS) -fPIC -nostdlib -o $@ $^ -DDIETHOME=\"$(prefix)\" -D__DYN_LIB -DVERSION=\"$(VERSION)\" -L$(PICODIR) -lc -lgcc $(PICODIR)/dyn_stop.o -Wl,-dynamic-linker=$(ILIBDIR)/libdl.so -DINSTALLVERSION
|
|
- $(CROSS)strip -R .command -R .note $@
|
|
+ $(STRIP) -R .command -R .note $@
|
|
|
|
$(OBJDIR)/djb: $(OBJDIR)/compile $(OBJDIR)/load
|
|
|
|
--
|
|
1.6.2.5
|
|
|