From 7bb6c6bc84d6c40bee1b42de9217edb909f12dce Mon Sep 17 00:00:00 2001 From: Ruben Ayrapetyan Date: Mon, 17 Nov 2014 13:05:02 +0300 Subject: [PATCH] Removing debug_release.* build targets. --- Makefile | 22 +++++++++------------- Makefile.mk | 2 +- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 81fdebe5d..ac7816a9a 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,10 @@ # # Target naming scheme # -# Main targets: {debug,release,debug_release}.{linux,stm32f{4}}[.{check,flash}] +# Main targets: {debug,release}.{linux,stm32f{4}}[.{check,flash}] # # Target mode part (before dot): # debug: - JERRY_NDEBUG; - optimizations; + debug symbols; + -Werror | debug build -# debug_release: - JERRY_NDEBUG; + optimizations; + debug symbols; + -Werror | checked release build # release: + JERRY_NDEBUG; + optimizations; - debug symbols; + -Werror | release build # # Target system and modifiers part (after first dot): @@ -41,7 +40,7 @@ # dwarf4=1 - use DWARF v4 format for debug information # -export TARGET_DEBUG_MODES = debug debug_release +export TARGET_DEBUG_MODES = debug export TARGET_RELEASE_MODES = release export TARGET_PC_SYSTEMS = linux export TARGET_MCU_SYSTEMS = $(addprefix stm32f,3 4) @@ -86,20 +85,17 @@ build: clean $(JERRY_TARGETS) all: precommit PRECOMMIT_CHECK_TARGETS_NO_VALGRIND_LIST= debug.linux.check \ - release.linux.check \ - debug_release.linux.check + release.linux.check PRECOMMIT_CHECK_TARGETS_VALGRIND_LIST= debug.linux-valgrind.check \ release.linux-musl-valgrind.check \ debug.linux-valgrind-cp.check - # debug.linux-musl-valgrind.check \ - debug_release.linux-valgrind.check \ - debug_release.linux-musl.check \ - release.linux-valgrind.check \ - release.linux.check \ - debug.linux-sanitize.check \ - release.linux-sanitize.check \ - debug_release.linux-sanitize.check + # debug.linux-musl-valgrind.check \ + release.linux-valgrind.check \ + release.linux.check \ + debug.linux-sanitize.check \ + release.linux-sanitize.check \ + push: ./tools/push.sh @ ./tools/push.sh diff --git a/Makefile.mk b/Makefile.mk index 81af6219e..98d362875 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -134,7 +134,7 @@ else endif # Optimizations -ifeq ($(filter-out debug_release release $(TESTS_TARGET),$(TARGET_MODE)),) +ifeq ($(filter-out release $(TESTS_TARGET),$(TARGET_MODE)),) OPTION_OPTIMIZE = enable else OPTION_OPTIMIZE = disable