Signed-off-by: Matt Helsley <matthltc@xxxxxxxxxx> --- Makefile | 7 +++++++ eventfd/Makefile | 4 ++-- futex/module.mk | 2 +- pty/Makefile | 2 +- selinux/Makefile | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e8eb048..f17a9be 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,13 @@ override CFLAGS += -Wall all: +# Prefix CC, AS, LD, AR for cross compilation +CROSS_COMPILE ?= +CC ?= $(CROSS_COMPILE)gcc +LD ?= $(CROSS_COMPILE)ld +AS ?= $(CROSS_COMPILE)as +AR ?= $(CROSS_COMPILE)ar + include $(addsuffix /module.mk,$(modules)) progs += mysu diff --git a/eventfd/Makefile b/eventfd/Makefile index 82456e8..1bcd587 100644 --- a/eventfd/Makefile +++ b/eventfd/Makefile @@ -13,10 +13,10 @@ all: $(PROGS) $(MAKE) -C ../libcrtest libcrtest.a libeptest.a: libeptest.o libeptest.h - ar cr libeptest.a libeptest.o + $(AR) cr libeptest.a libeptest.o $(PROGS): %: %.c $(LIBS) - gcc -Wall $(CFLAGS) -o $@ $< $(LIBS) + $(CC) -Wall $(CFLAGS) -o $@ $< $(LIBS) clean: rm -f *.o libeptest.a $(PROGS) diff --git a/futex/module.mk b/futex/module.mk index 6ab0449..412216b 100644 --- a/futex/module.mk +++ b/futex/module.mk @@ -1,7 +1,7 @@ local_dir := futex local_progs := $(addprefix $(local_dir)/,plain robust pi) -MACHINE := $(shell gcc -dumpmachine) +MACHINE := $(shell $(CC) -dumpmachine) ifeq ($(MACHINE:i386-%=i386),i386) ARCHOPTS := -march=i486 endif diff --git a/pty/Makefile b/pty/Makefile index fe93a00..438f9bc 100644 --- a/pty/Makefile +++ b/pty/Makefile @@ -6,7 +6,7 @@ SLIBS = ../libcrtest/libcrtest.a LIBCMD = -I../libcrtest -L../libcrtest $(SLIBS) ptyloop: ptyloop.c ../clone.h $(SLIBS) - gcc -o ptyloop ptyloop.c $(LIBCMD) + $(CC) -o ptyloop ptyloop.c $(LIBCMD) clean: rm -f $(targets) out* ckpt-out read-ok read-bad diff --git a/selinux/Makefile b/selinux/Makefile index 2ae8d96..f96384d 100644 --- a/selinux/Makefile +++ b/selinux/Makefile @@ -3,7 +3,7 @@ targets = ckpt wrap all: $(targets) ckpt: ckpt.c ../cr.h - gcc -o ckpt ckpt.c + $(CC) -o ckpt ckpt.c clean: rm -rf $(targets) out context cr-test.out cr-test-module restart wrap -- 1.6.3.3 _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers