summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2006-03-30 00:48:30 +0200
committerKay Sievers <kay.sievers@suse.de>2006-03-30 00:48:30 +0200
commit1fda06ae9891494b5890b287bd6db01b685a8be6 (patch)
tree131dde80de0e46eaa41c64ee79a950f40b3d976e
parent1945917d4b2048e56b0b7e26f15b6bcec8c786e9 (diff)
pass CROSS_COMPILE to AR and RANLIB down to extras/
-rw-r--r--Makefile3
-rw-r--r--extras/volume_id/lib/Makefile3
2 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 1b9534c7b8..fb7428279e 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,6 @@ CC = $(CROSS_COMPILE)gcc
LD = $(CROSS_COMPILE)gcc
AR = $(CROSS_COMPILE)ar
RANLIB = $(CROSS_COMPILE)ranlib
-HOSTCC = gcc
CFLAGS = -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
WARNINGS = -Wstrict-prototypes -Wsign-compare -Wshadow \
@@ -175,6 +174,8 @@ all: $(PROGRAMS) $(MAN_PAGES)
CFLAGS="$(CFLAGS)" \
LD="$(LD)" \
LDFLAGS="$(LDFLAGS)" \
+ AR="$(AR)" \
+ RANLIB="$(RANLIB)" \
LIB_OBJS="$(LIB_OBJS)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
-C $$target $@ || exit 1; \
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index f69df5f5ca..a0c773550e 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -54,9 +54,6 @@ HEADERS= \
libvolume_id.h \
util.h
-AR = $(CROSS)ar
-RANLIB = $(CROSS)ranlib
-
all: libvolume_id.a $(SHLIB) libvolume_id.pc
.PHONY: all
.DEFAULT: all