diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-03-11 21:55:54 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-03-11 21:55:54 +0400 |
| commit | 622d08758e8514760e0dce13ae4bda42d381d610 (patch) | |
| tree | 67fbc83f9e09b92c67402212e223e9127b15fe08 | |
| parent | 9c719d13f93457ee4ab3b0b97fb680801dc743d0 (diff) | |
| parent | 71ebabdef041e78279dfc444364934aaccac040c (diff) | |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20140311.0llct-20140311.1
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -607,6 +607,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR ifeq ($(call cc-option, $(stackp-flag)),) $(warning Cannot use CONFIG_CC_STACKPROTECTOR_REGULAR: \ -fstack-protector not supported by compiler) + stackp-flag := endif else ifdef CONFIG_CC_STACKPROTECTOR_STRONG @@ -614,6 +615,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_STRONG ifeq ($(call cc-option, $(stackp-flag)),) $(warning Cannot use CONFIG_CC_STACKPROTECTOR_STRONG: \ -fstack-protector-strong not supported by compiler) + stackp-flag := endif else # Force off for distro compilers that enable stack protector by default. 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: |