diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-08-12 02:43:45 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-08-12 02:43:45 +0000 |
| commit | 50dcba0bb24c6c57397dab0ee4a083ee2c8266aa (patch) | |
| tree | 39b45cc38150687420b955cee4a2038452e28733 /utils | |
| parent | 3e618254fd7d842f63b19b89a7b9cee0ec76637b (diff) | |
| download | uClibc-alpine-50dcba0bb24c6c57397dab0ee4a083ee2c8266aa.tar.bz2 uClibc-alpine-50dcba0bb24c6c57397dab0ee4a083ee2c8266aa.tar.xz | |
Bring in latest from trunk.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/utils/Makefile b/utils/Makefile index fcd38fea4..7023a9b21 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -46,22 +46,27 @@ readelf: readelf.c $(CC) $(CFLAGS) $^ -o $@ $(STRIPTOOL) -s -x -R .note -R .comment $@ +ifeq ($(strip $(UCLIBC_STATIC_LDCONFIG)),y) +LDCONFIG_CFLAGS := -static +else +LDCONFIG_CFLAGS := $(PIEFLAG) $(LDPIEFLAG) +endif ldconfig: ldconfig.c - $(CC) $(CFLAGS) $(if $(filter $(UCLIBC_STATIC_LDCONFIG),y),-static) \ + $(CC) $(CFLAGS) $(LDCONFIG_CFLAGS) \ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I../ldso/include \ $^ -o $@ $(STRIPTOOL) -s -x -R .note -R .comment $@ ldd: ldd.c - $(CC) $(CFLAGS) $(PIEFLAG) \ + $(CC) $(CFLAGS) $(PIEFLAG) $(LDPIEFLAG) \ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=$(UCLIBC_LDSO) -I. -I../ldso/include \ $^ -o $@ $(STRIPTOOL) -s -x -R .note -R .comment $@ iconv: ../libc/misc/wchar/wchar.c - $(CC) $(CFLAGS) $(PIEFLAG) -Wl,-s \ + $(CC) $(CFLAGS) $(PIEFLAG) $(LDPIEFLAG) \ -DL_iconv_main \ $^ -o $@ $(STRIPTOOL) -s -x -R .note -R .comment $@ |