From d8c721f57a9c4fe3432433df00dd7038cf9f2ca9 Mon Sep 17 00:00:00 2001 From: "e.gavrin" Date: Wed, 30 Jul 2014 00:22:14 +0400 Subject: [PATCH] Fix not working ulimit while using musl=1. Add color flag, that enables -fdiagnostics-color=always if specified --- Makefile.mak | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.mak b/Makefile.mak index 4bd077e57..527335660 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -104,6 +104,12 @@ else OPTION_MUSL := disable endif +ifeq ($(color),1) + OPTION_COLOR := enable +else + OPTION_COLOR := disable +endif + # # Target CPU # @@ -221,7 +227,7 @@ endif ifeq ($(OPTION_MCU),disable) DEFINES_JERRY += -D__HOST -DJERRY_SOURCE_BUFFER_SIZE=$$((1024*1024)) - CFLAGS_COMMON += -fno-stack-protector + CFLAGS_COMMON += -fno-stack-protector ifeq ($(OPTION_MUSL),enable) CC := musl-$(CC) @@ -229,6 +235,9 @@ ifeq ($(OPTION_MCU),disable) else CFLAGS_COMMON += -fsanitize=address endif + ifeq ($(OPTION_COLOR),enable) + CFLAGS_COMMON += -fdiagnostics-color=always + endif else CFLAGS_COMMON += -ffunction-sections -fdata-sections -nostdlib DEFINES_JERRY += -D__TARGET_MCU