From 3e1e0dc733661f249c543103c6b8dcde4d5ea26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zsolt=20Borb=C3=A9ly?= Date: Wed, 10 Feb 2016 16:42:23 +0100 Subject: [PATCH] Move the logic of Valgrind-support check to the CMake part. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Related pull request: #866 JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély zsborbely.u-szeged@partner.samsung.com --- CMakeLists.txt | 4 ++++ Makefile | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5ee9b69b..b10c0d9d6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,10 @@ project (Jerry CXX C ASM) option(STRIP_RELEASE_BINARY "Strip symbols from release binaries" ON) elseif("${PLATFORM}" STREQUAL "MCU") + if (("${ENABLE_VALGRIND}" STREQUAL "ON") OR ("${ENABLE_VALGRIND_FREYA}" STREQUAL "ON")) + message(FATAL_ERROR "This target isn't supported with Valgrind.") + endif() + set(PLATFORM_EXT "MCU_${CMAKE_SYSTEM_VERSION}") set(EXTERNAL_BUILD FALSE) diff --git a/Makefile b/Makefile index 87b9e1acf..9b0d57021 100644 --- a/Makefile +++ b/Makefile @@ -58,15 +58,6 @@ export TARGET_NATIVE_SYSTEMS = $(shell uname -s | tr '[:upper:]' '[:lower:]') VALGRIND_FREYA := OFF endif - # Indicate when Valgrind or Valgrind_Freya option is enabled. - VALGRIND_IS_ENABLED ?= OFF - - ifneq ($(VALGRIND)$(VALGRIND_FREYA), OFFOFF) - VALGRIND_IS_ENABLED := ON - else - VALGRIND_IS_ENABLED := OFF - endif - # Static checkers STATIC_CHECK ?= OFF @@ -222,7 +213,6 @@ $(BUILD_DIRS_NATIVE): .PHONY: $(BUILD_DIRS_STM32F3) $(BUILD_DIRS_STM32F3): prerequisites - $(Q) [ "$(VALGRIND_IS_ENABLED)" = "OFF" ] || (echo "Build failed. This target doesn't support build with Valgrind."; exit 1;) $(Q) mkdir -p $@ $(Q) cd $@ && \ (cmake -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_VALGRIND_FREYA=$(VALGRIND_FREYA) -DENABLE_LTO=$(LTO) -DENABLE_ALL_IN_ONE=$(ALL_IN_ONE) -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_mcu_stm32f3.cmake ../../.. 2>&1 | tee cmake.log $(QLOG) ; ( exit $${PIPESTATUS[0]} ) ) || \ @@ -230,7 +220,6 @@ $(BUILD_DIRS_STM32F3): prerequisites .PHONY: $(BUILD_DIRS_STM32F4) $(BUILD_DIRS_STM32F4): prerequisites - $(Q) [ "$(VALGRIND_IS_ENABLED)" = "OFF" ] || (echo "Build failed. This target doesn't support build with Valgrind."; exit 1;) $(Q) mkdir -p $@ $(Q) cd $@ && \ (cmake -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_VALGRIND_FREYA=$(VALGRIND_FREYA) -DENABLE_LTO=$(LTO) -DENABLE_ALL_IN_ONE=$(ALL_IN_ONE) -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_mcu_stm32f4.cmake ../../.. 2>&1 | tee cmake.log $(QLOG) ; ( exit $${PIPESTATUS[0]} ) ) || \