diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-10-28 17:09:00 -0700 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-10-28 17:09:00 -0700 |
| commit | 6f45b593cb430cd010e5eee59ea8ecb904491224 (patch) | |
| tree | c946db7366c33b64228008b0dd4d6e8b8b9f1f10 | |
| parent | 2b4e6caf1e8f1d8078d90523061ca304b9a9987e (diff) | |
| parent | 62c0ded0aaabc08a2eb78ac2112d18210d0482d8 (diff) | |
Merge branch 'tracking-llct-v3.12-misc-fixes' into merge-linux-linaro-core-trackingllct-20131028.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 3dba0a4aebbf..e9409a8ccd57 100644 --- a/tools/lib/lk/Makefile +++ b/tools/lib/lk/Makefile @@ -18,6 +18,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 64c043b7a438..fe36b17f3044 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -678,12 +678,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: |