diff options
| author | Goro Kikuchi <[email protected]> | 2012-04-19 19:55:26 -0700 |
|---|---|---|
| committer | Goro Kikuchi <[email protected]> | 2012-04-19 19:55:26 -0700 |
| commit | 8a5943f2540cf43bb15789bc519e1b355d479fed (patch) | |
| tree | 451e762b9dc5b2922ad3063a172dc1bf8f542653 | |
| parent | cfa6ca8daa142443d9b1bd6b68105f914b39a72f (diff) | |
| parent | 975031cd2b51974f2d23834eeb502584c6442f14 (diff) | |
| download | mruby-8a5943f2540cf43bb15789bc519e1b355d479fed.tar.gz mruby-8a5943f2540cf43bb15789bc519e1b355d479fed.zip | |
Merge pull request #1 from mattn/fix_makefile
fix Makefile: quoted CC/LL are heap up to each Makefiles.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | mrblib/Makefile | 3 | ||||
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | tools/mrbc/Makefile | 2 | ||||
| -rw-r--r-- | tools/mruby/Makefile | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -56,7 +56,7 @@ else CFLAGS = -O3 endif ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) -MAKE_FLAGS = --no-print-directory CC="$(CC)" LL="$(LL)" +MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ############################## # generic build targets, rules diff --git a/mrblib/Makefile b/mrblib/Makefile index 91dfe4c64..0192ec941 100644 --- a/mrblib/Makefile +++ b/mrblib/Makefile @@ -15,6 +15,7 @@ MRBS := $(MRB1) # C compiler (gcc) CC = gcc +LL = gcc DEBUG_MODE = 1 ifeq ($(DEBUG_MODE),1) CFLAGS = -g @@ -23,7 +24,7 @@ CFLAGS = -O3 endif INCLUDES = -I../src -I../include ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) -MAKE_FLAGS = --no-print-directory CC="$(CC)" LL="$(LL)" +MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) # mruby compiler ifeq ($(OS),Windows_NT) diff --git a/src/Makefile b/src/Makefile index 41a2c83a0..ea3681dce 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,6 +34,7 @@ INCLUDES = -I$(BASEDIR) -I$(BASEDIR)/../include # compiler, linker (gcc) CC = gcc +LL = gcc AR = ar YACC = bison @@ -44,7 +45,7 @@ else CFLAGS = -O3 endif ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) -MAKE_FLAGS = --no-print-directory CC="$(CC)" LL="$(LL)" +MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ############################## # generic build targets, rules diff --git a/tools/mrbc/Makefile b/tools/mrbc/Makefile index 767f5c074..ba7764b78 100644 --- a/tools/mrbc/Makefile +++ b/tools/mrbc/Makefile @@ -37,7 +37,7 @@ else CFLAGS = -O3 endif ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) -MAKE_FLAGS = --no-print-directory CC="$(CC)" LL="$(LL)" +MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ############################## # generic build targets, rules diff --git a/tools/mruby/Makefile b/tools/mruby/Makefile index 18882e4ee..dfb8b7f7c 100644 --- a/tools/mruby/Makefile +++ b/tools/mruby/Makefile @@ -45,7 +45,7 @@ else CFLAGS = -O3 endif ALL_CFLAGS = -Wall -Werror-implicit-function-declaration $(CFLAGS) -MAKE_FLAGS = --no-print-directory CC="$(CC)" LL="$(LL)" +MAKE_FLAGS = --no-print-directory CC=$(CC) LL=$(LL) ############################## # generic build targets, rules |