diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-05-05 20:53:50 +0400 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-05-05 20:53:50 +0400 |
commit | 767d4e2889139812ee64075c77e904bee08e9702 (patch) | |
tree | 870fcc805dc8b5e8de11375c7a4ac7a606d1242e | |
parent | 8d6d4551c0fcbaebceaf5a2f55cc8f98b31ffc2e (diff) | |
parent | c7e28bb5082ceb2a849397bacc60f7ec4494b9a6 (diff) |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingtracking-llct-ll-20140507.0llct-20140505.0
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | tools/perf/Makefile.perf | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -622,6 +622,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 @@ -629,6 +630,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 895edd32930c..7ff491773ece 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -762,13 +762,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: |