diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-12-01 15:38:51 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-12-01 15:38:51 +0300 |
| commit | 9d64a39bfe10fd833c13426641768af9e5ee5402 (patch) | |
| tree | 7a85b18b31eb4b3e5344b3b1ee982a9ef7d66fde | |
| parent | 5492a6a013353a00d4e9b832b3ce6216e7b33b8f (diff) | |
| parent | 5ff7a27fe1511b044c194603c94d030ec261b2a9 (diff) | |
Merge branch 'tracking-llct-misc-fixes' into merge-linux-linaro-core-trackingllct-20141201.0
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tools/perf/Makefile.perf | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -656,6 +656,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 @@ -663,6 +664,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 262916f4a377..c47222c87b65 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -776,13 +776,13 @@ LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch] $(LIB_PATH)fd/*.[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: |