diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-11-16 10:17:50 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-11-16 10:17:50 +0000 |
| commit | 02617044f597e50229e565b59ca7afc087a07f6c (patch) | |
| tree | 4e4df6b766e96465f926e75299e942c7dbc0096f | |
| parent | 947b9b17c1f2b532def0c9a8dbfc741e5dab037d (diff) | |
| download | drakx-02617044f597e50229e565b59ca7afc087a07f6c.tar drakx-02617044f597e50229e565b59ca7afc087a07f6c.tar.gz drakx-02617044f597e50229e565b59ca7afc087a07f6c.tar.bz2 drakx-02617044f597e50229e565b59ca7afc087a07f6c.tar.xz drakx-02617044f597e50229e565b59ca7afc087a07f6c.zip | |
fix linking of static archives with gcc
| -rw-r--r-- | mdk-stage1/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 4b1b31a76..aa75b8d23 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -79,11 +79,13 @@ FRONTEND_OBJS = $(subst .c,.o,$($(F)_FRONTEND_SRC)) FRONTEND_LINK = $(FRONTEND_OBJS) $($(F)_FRONTEND_LIBS) +STAGE1_STATIC_LIBS = libmodprobe.a +STAGE1_STATIC_USR_LIBS = libz.a libldetect.a libpci.a STAGE1_OWN_LIBS = ifeq (DIETLIBC, $(L)) -STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,libz.a libldetect.a libmodprobe.a libpci.a) +STAGE1_OWN_LIBS = $(patsubst %,/usr/lib/dietlibc/lib-$(ARCH)/%,$(STAGE1_STATIC_LIBS) $(STAGE1_STATIC_USR_LIBS)) else -STAGE1_OWN_LIBS = /usr/$(LIB)/libz.a +STAGE1_OWN_LIBS = $(patsubst %,/usr/$(LIB)/%,$(STAGE1_STATIC_USR_LIBS)) $(patsubst %,/$(LIB)/%,$(STAGE1_STATIC_LIBS)) endif |