Skip to content

Commit

Permalink
Makefile updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
awgn committed Sep 12, 2017
1 parent fd0931f commit b6d60fe
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Makefile
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions define.mk
Expand Up @@ -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

Expand Down

0 comments on commit b6d60fe

Please sign in to comment.