Merge branch 'master' of git-server:jerry

2014-07-30 14:43:13 +04:00
parent ab4e59700f c1d0a4dd13
commit c6baf89035
15 changed files with 151 additions and 112 deletions
@@ -229,10 +229,12 @@ ifeq ($(OPTION_MCU),disable)
 
 ifeq ($(OPTION_MUSL),enable)
  CC := musl-$(CC) 
+  DEFINES_JERRY += -DLIBC_MUSL
  CFLAGS_COMMON += -static
 else
  CFLAGS_COMMON += -fsanitize=address
 endif
+
 ifeq ($(OPTION_COLOR),enable)
  CFLAGS_COMMON += -fdiagnostics-color=always
 endif