Skip to content

M
mruby
Commit 95bed117 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Merge pull request #297 from bovi/improve-cflag-choice 

Make CFLAG choices in Makefiles more flexible
parents 955a48d9 83e5999d
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 33 deletions
Makefile
View file @ 95bed117
...@@ -7,12 +7,19 @@ export LL = gcc ...@@ -7,12 +7,19 @@ export LL = gcc
export AR = ar export AR = ar
export YACC = bison export YACC = bison
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
CFLAGS = -g -O3 COMPILE_MODE = debug
else endif
CFLAGS = -O3
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3
else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ALL_CFLAGS='$(ALL_CFLAGS)' MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ALL_CFLAGS='$(ALL_CFLAGS)'
......
mrblib/Makefile
View file @ 95bed117
...@@ -18,12 +18,19 @@ LIBR := ../lib/libmruby.a ...@@ -18,12 +18,19 @@ LIBR := ../lib/libmruby.a
# libraries, includes # libraries, includes
INCLUDES = -I../src -I../include INCLUDES = -I../src -I../include
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
CFLAGS = -g COMPILE_MODE = debug
else endif
CFLAGS = -O3
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3
else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)" MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
......
src/Makefile
View file @ 95bed117
...@@ -19,12 +19,19 @@ OBJS := $(OBJ1) $(OBJ2) $(OBJ3) ...@@ -19,12 +19,19 @@ OBJS := $(OBJ1) $(OBJ2) $(OBJ3)
# libraries, includes # libraries, includes
INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
CFLAGS = -g -O3 COMPILE_MODE = debug
else
CFLAGS = -O3
endif endif
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3
else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
......
test/Makefile
View file @ 95bed117
...@@ -20,12 +20,19 @@ OBJS := driver.o $(MLIB) ...@@ -20,12 +20,19 @@ OBJS := driver.o $(MLIB)
LIBS = -lm LIBS = -lm
INCLUDES = -I$(BASEDIR)/../src -I$(BASEDIR)/../include INCLUDES = -I$(BASEDIR)/../src -I$(BASEDIR)/../include
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
CFLAGS = -g COMPILE_MODE = debug
else endif
CFLAGS = -O3
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3
else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)" MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
......
tools/mirb/Makefile
View file @ 95bed117
...@@ -21,12 +21,19 @@ EXTS := $(EXT1) ...@@ -21,12 +21,19 @@ EXTS := $(EXT1)
LIBS = -lm LIBS = -lm
INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
COMPILE_MODE = debug
endif
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3 CFLAGS = -g -O3
else else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3 CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)" MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
......
tools/mrbc/Makefile
View file @ 95bed117
...@@ -23,12 +23,19 @@ LIBS = -lm ...@@ -23,12 +23,19 @@ LIBS = -lm
INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include
# compiler, linker (gcc) # compiler, linker (gcc)
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
CFLAGS = -g -O3 COMPILE_MODE = debug
else endif
CFLAGS = -O3
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3
else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)" MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
......
tools/mruby/Makefile
View file @ 95bed117
...@@ -26,12 +26,19 @@ LIBS = -lm ...@@ -26,12 +26,19 @@ LIBS = -lm
INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include
# compiler, linker (gcc) # compiler, linker (gcc)
DEBUG_MODE = 1 ifeq ($(strip $(COMPILE_MODE)),)
ifeq ($(DEBUG_MODE),1) # default compile option
CFLAGS = -g -O3 COMPILE_MODE = debug
else endif
CFLAGS = -O3
ifeq ($(COMPILE_MODE),debug)
CFLAGS = -g -O3
else ifeq ($(COMPILE_MODE),release)
CFLAGS = -O3
else ifeq ($(COMPILE_MODE),small)
CFLAGS = -Os
endif endif
ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS)
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)" MAKE_FLAGS = CC=$(CC) LL=$(LL) ALL_CFLAGS="$(ALL_CFLAGS)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment