diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-05 11:43:04 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-05 11:43:04 +0400 |
| commit | af90a327bd2f3eb7365d666959ba30744ac63282 (patch) | |
| tree | cf904c9849ff8031f064287ed493b00f6c20cb57 | |
| parent | 4586bbeeee214cc3e3efdb210df9d9e4d6650943 (diff) | |
| parent | f994462e51ccb7b3899527d561206845b5cc1752 (diff) | |
Automatically merging tracking-llct-v3.13-misc-fixes into merge-linux-linaro-core-trackingllct-20140205.0
Conflicting files:
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7257e7e9e38a..3749a8b0daee 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -738,13 +738,13 @@ LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch]) # already $(LIBAPIKFS): $(LIBAPIKFS_SOURCES) ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libapikfs.a + $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) libapikfs.a endif $(LIBAPIKFS)-clean: ifeq ($(subdir),) $(call QUIET_CLEAN, libapikfs) - @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null + @$(MAKE) -C $(LIB_DIR) CROSS_COMPILE=$(CROSS_COMPILE) O=$(OUTPUT) clean >/dev/null endif help: |