YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix not working ulimit while using musl=1. Add color flag, that enables -fdiagnostics-color=always if specified

Browse Source
This commit is contained in:
e.gavrin
2014-07-30 00:22:14 +04:00
parent 076af9e1d3
commit d8c721f57a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.mak
+10 -1
View File
@@ -104,6 +104,12 @@ else
OPTION_MUSL := disable OPTION_MUSL := disable
endif endif
ifeq ($(color),1)
OPTION_COLOR := enable
else
OPTION_COLOR := disable
endif
# #
# Target CPU # Target CPU
# #
@@ -221,7 +227,7 @@ endif
ifeq ($(OPTION_MCU),disable) ifeq ($(OPTION_MCU),disable)
DEFINES_JERRY += -D__HOST -DJERRY_SOURCE_BUFFER_SIZE=$$((1024*1024)) DEFINES_JERRY += -D__HOST -DJERRY_SOURCE_BUFFER_SIZE=$$((1024*1024))
CFLAGS_COMMON += -fno-stack-protector CFLAGS_COMMON += -fno-stack-protector
ifeq ($(OPTION_MUSL),enable) ifeq ($(OPTION_MUSL),enable)
CC := musl-$(CC) CC := musl-$(CC)
@@ -229,6 +235,9 @@ ifeq ($(OPTION_MCU),disable)
else else
CFLAGS_COMMON += -fsanitize=address CFLAGS_COMMON += -fsanitize=address
endif endif
ifeq ($(OPTION_COLOR),enable)
CFLAGS_COMMON += -fdiagnostics-color=always
endif
else else
CFLAGS_COMMON += -ffunction-sections -fdata-sections -nostdlib CFLAGS_COMMON += -ffunction-sections -fdata-sections -nostdlib
DEFINES_JERRY += -D__TARGET_MCU DEFINES_JERRY += -D__TARGET_MCU