From b6d60fefac00f6d46976ccd3acd5dc0bb190de38 Mon Sep 17 00:00:00 2001 From: Nicola Bonelli Date: Tue, 12 Sep 2017 11:19:44 +0200 Subject: [PATCH] Makefile updated. --- Makefile | 5 ++--- define.mk | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 0e261bd4..dab185d4 100644 --- a/Makefile +++ b/Makefile @@ -23,9 +23,8 @@ MAKE_PID := $(shell echo $$PPID) JOB_FLAG := $(filter -j%, $(subst -j ,-j,$(shell ps T | grep "^\s*$(MAKE_PID).*$(MAKE)"))) JOBS := $(subst -j,,$(JOB_FLAG)) -HASKELL_BUILD ?= stack - -BUILD_TYPE ?= Release +HASKELL_BUILD = stack +BUILD_TYPE = Release include define.mk diff --git a/define.mk b/define.mk index 0e47d9dd..7fbbacc4 100644 --- a/define.mk +++ b/define.mk @@ -19,11 +19,11 @@ ifdef BUILD_TYPE define cmake-configure = - cmake -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) . + cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) . endef else define cmake-configure = - cmake . + cmake -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) . endef endif