From f2bdf0851181d343958d34ebdee8d284a528e85b Mon Sep 17 00:00:00 2001
From: Akos Kiss <akiss@inf.u-szeged.hu>
Date: Tue, 1 Mar 2016 00:27:24 +0100
Subject: [PATCH] Remove default handling of build options from Makefile

The handling of option defaults is already done in CMakeLists, it
is no good practice to duplicate the logic in the Makefile.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
---
 .gitignore |  2 +-
 Makefile   | 58 +++++++++++++++++++++---------------------------------
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 296804b1a8..4dcc218442 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # Produced files
 
 build/bin
-build/obj-*
+build/obj*
 build/prerequisites
 build/tests
 
diff --git a/Makefile b/Makefile
index ef94275d95..fd2a8714ef 100644
--- a/Makefile
+++ b/Makefile
@@ -49,56 +49,47 @@ export MCU_MODS := cp cp_minimal
 export NATIVE_MODS := $(MCU_MODS) mem_stats mem_stress_test
 
 # Options
- # Valgrind
-  VALGRIND ?= OFF
+CMAKE_DEFINES:=
+BUILD_NAME:=
 
-  ifneq ($(VALGRIND),ON)
-   VALGRIND := OFF
+ # Valgrind
+  ifneq ($(VALGRIND),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_VALGRIND=$(VALGRIND)
+   BUILD_NAME:=$(BUILD_NAME)-VALGRIND-$(VALGRIND)
   endif
 
  # Valgrind Freya
-  VALGRIND_FREYA ?= OFF
-
-  ifneq ($(VALGRIND_FREYA),ON)
-   VALGRIND_FREYA := OFF
+  ifneq ($(VALGRIND_FREYA),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_VALGRIND_FREYA=$(VALGRIND_FREYA)
+   BUILD_NAME:=$(BUILD_NAME)-VALGRIND_FREYA-$(VALGRIND_FREYA)
   endif
 
  # LTO
-  ifeq ($(NATIVE_SYSTEM),darwin)
-   LTO ?= OFF
-  else
-   LTO ?= ON
-  endif
-
-  ifneq ($(LTO),ON)
-   LTO := OFF
+  ifneq ($(LTO),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_LTO=$(LTO)
+   BUILD_NAME:=$(BUILD_NAME)-LTO-$(LTO)
   endif
 
  # LOG
-  LOG ?= OFF
-  ifneq ($(LOG),ON)
-   LOG := OFF
+  ifneq ($(LOG),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_LOG=$(LOG)
   endif
 
  # All-in-one build
-  ifeq ($(NATIVE_SYSTEM),darwin)
-   ALL_IN_ONE ?= ON
-  else
-   ALL_IN_ONE ?= OFF
-  endif
-
-  ifneq ($(ALL_IN_ONE),ON)
-   ALL_IN_ONE := OFF
+  ifneq ($(ALL_IN_ONE),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DENABLE_ALL_IN_ONE=$(ALL_IN_ONE)
+   BUILD_NAME:=$(BUILD_NAME)-ALL_IN_ONE-$(ALL_IN_ONE)
   endif
 
-# External build configuration
  # Flag, indicating whether to use compiler's default libc (YES / NO)
-  USE_COMPILER_DEFAULT_LIBC ?= NO
+  ifneq ($(USE_COMPILER_DEFAULT_LIBC),)
+   CMAKE_DEFINES:=$(CMAKE_DEFINES) -DUSE_COMPILER_DEFAULT_LIBC=$(USE_COMPILER_DEFAULT_LIBC)
+  endif
 
 # Directories
 export ROOT_DIR := $(shell pwd)
 export BUILD_DIR_PREFIX := $(ROOT_DIR)/build/obj
-export BUILD_DIR := $(BUILD_DIR_PREFIX)-VALGRIND-$(VALGRIND)-VALGRIND_FREYA-$(VALGRIND_FREYA)-LTO-$(LTO)-ALL_IN_ONE-$(ALL_IN_ONE)
+export BUILD_DIR := $(BUILD_DIR_PREFIX)$(BUILD_NAME)
 export OUT_DIR := $(ROOT_DIR)/build/bin
 export PREREQUISITES_STATE_DIR := $(ROOT_DIR)/build/prerequisites
 
@@ -220,12 +211,7 @@ define GEN_MAKEFILE_RULE
 .PHONY: $(1)/Makefile
 $(1)/Makefile: $(1)/toolchain.config
 	$$(Q) $$(call SHLOG,(cd $(1) && cmake -G $$(BUILD_GENERATOR) \
-          -DENABLE_VALGRIND=$$(VALGRIND) \
-          -DENABLE_VALGRIND_FREYA=$$(VALGRIND_FREYA) \
-          -DENABLE_LOG=$$(LOG) \
-          -DENABLE_LTO=$$(LTO) \
-          -DENABLE_ALL_IN_ONE=$$(ALL_IN_ONE) \
-          -DUSE_COMPILER_DEFAULT_LIBC=$$(USE_COMPILER_DEFAULT_LIBC) \
+          $$(CMAKE_DEFINES) \
           -DCMAKE_TOOLCHAIN_FILE=`cat toolchain.config` $$(ROOT_DIR) 2>&1),$(1)/cmake.log,CMake run)
 endef