From 1793072c674ad6e7110236188ef87ea1fc73a484 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Wed, 10 Sep 2014 16:08:49 +0200 Subject: [PATCH] fix CC parameter given to make in testprof folder --- makefile.mingw | 2 +- makefile.shared | 2 +- makefile.unix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile.mingw b/makefile.mingw index 2893aa20..28da819c 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -210,7 +210,7 @@ library: $(LIBNAME) .PHONY: testprof/$(LIBTEST) testprof/$(LIBTEST): - $(MAKE) -C testprof -f makefile.mingw CFLAGS_OPTS="$(CFLAGS)" LIBTEST_S=$(LIBTEST) CC=$(CC) LD=$(LD) AR=$(AR) ARFLAGS=$(ARFLAGS) RANLIB=$(RANLIB) + $(MAKE) -C testprof -f makefile.mingw CFLAGS_OPTS="$(CFLAGS)" LIBTEST_S=$(LIBTEST) CC="$(CC)" LD=$(LD) AR=$(AR) ARFLAGS="$(ARFLAGS)" RANLIB=$(RANLIB) $(LIBNAME): $(OBJECTS) $(AR) $(ARFLAGS) $@ $(OBJECTS) diff --git a/makefile.shared b/makefile.shared index f54ecb05..96adb41c 100644 --- a/makefile.shared +++ b/makefile.shared @@ -263,7 +263,7 @@ library: $(LIBNAME) .PHONY: testprof/$(LIBTEST) testprof/$(LIBTEST): - cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) LT=$(LT) CC=$(CC) make -f makefile.shared + cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) LT=$(LT) CC="$(CC)" make -f makefile.shared .c.o: $(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ -c $< diff --git a/makefile.unix b/makefile.unix index 91af9b1d..83abbcea 100644 --- a/makefile.unix +++ b/makefile.unix @@ -210,7 +210,7 @@ library: $(LIBNAME) .PHONY: testprof/$(LIBTEST) testprof/$(LIBTEST): - cd testprof ; CFLAGS="$(CFLAGS)" LIBTEST_S=$(LIBTEST_S) $(MAKE) + cd testprof ; CFLAGS="$(CFLAGS)" LIBTEST_S=$(LIBTEST_S) CC="$(CC)" LD="$(LD)" AR="$(AR)" RANLIB="$(RANLIB)" $(MAKE) $(LIBNAME): $(OBJECTS) $(AR) $(ARFLAGS) $@ $(OBJECTS)