diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-09-11 21:59:14 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-09-11 21:59:14 +0400 |
| commit | f2f6516bef603bd6e3b08015db4fef42fb5ebfbb (patch) | |
| tree | 19c4c098f4c7f8ee0c018217ca13f12265892fb1 | |
| parent | dbc1ee1168c06b98558c05c16b87a463bd958847 (diff) | |
| parent | 6495d86b3b69639d9feff6040348586f947dec28 (diff) | |
Merge branch 'tracking-llct-v3.11-misc-fixes' into merge-linux-linaro-core-trackingllct-20130911.0
| -rw-r--r-- | tools/lib/lk/Makefile | 2 | ||||
| -rw-r--r-- | tools/perf/Makefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/lib/lk/Makefile b/tools/lib/lk/Makefile index 280dd8205430..e5cccc10a44c 100644 --- a/tools/lib/lk/Makefile +++ b/tools/lib/lk/Makefile @@ -33,6 +33,8 @@ EXTLIBS = -lelf -lpthread -lrt -lm ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ALL_LDFLAGS = $(LDFLAGS) +CC = $(CROSS_COMPILE)gcc +AR = $(CROSS_COMPILE)ar RM = rm -f $(LIBFILE): $(LIB_OBJS) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 641fccddb249..9f9ab7c5087f 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -670,12 +670,12 @@ $(LIBTRACEEVENT)-clean: # already $(LIBLK): ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) liblk.a + $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) liblk.a endif $(LIBLK)-clean: ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) clean + $(QUIET_SUBDIR0)$(LK_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean endif help: |