diff options
| author | Yuichiro MASUI <[email protected]> | 2012-12-16 01:58:51 +0900 |
|---|---|---|
| committer | Yuichiro MASUI <[email protected]> | 2012-12-16 01:58:51 +0900 |
| commit | 4b8959daff04feabbcb3b2302f5171561ca1f194 (patch) | |
| tree | 2f75446c91d3da292fbbb69477dd57ea8f9bb0af /tools | |
| parent | 06d242ae430ad37fd88fe6490980121ee26a1283 (diff) | |
| parent | 404ad702db6b421eed9e5245edcb7c57eff9b359 (diff) | |
| download | mruby-4b8959daff04feabbcb3b2302f5171561ca1f194.tar.gz mruby-4b8959daff04feabbcb3b2302f5171561ca1f194.zip | |
Merge branch 'master' into use_ruby_for_building
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mirb/Makefile | 2 | ||||
| -rw-r--r-- | tools/mruby/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/mirb/Makefile b/tools/mirb/Makefile index 8e26feaf3..b953038a8 100644 --- a/tools/mirb/Makefile +++ b/tools/mirb/Makefile @@ -66,7 +66,7 @@ endif all : $(LIBR) $(EXE) # executable constructed using linker from object files -$(EXE) : $(LIBR) $(OBJS) $(EXTS) +$(EXE) : $(LIBR) $(OBJS) $(GEM_ARCHIVE_FILES) $(EXTS) $(LL) -o $@ $(LDFLAGS) $(OBJS) $(LIBR) $(GEM_ARCHIVE_FILES) $(EXTS) $(LIBS) -include $(OBJS:.o=.d) diff --git a/tools/mruby/Makefile b/tools/mruby/Makefile index 0316bfb8f..55e37aafa 100644 --- a/tools/mruby/Makefile +++ b/tools/mruby/Makefile @@ -71,7 +71,7 @@ endif all : $(LIBR) $(EXE) # executable constructed using linker from object files -$(EXE) : $(LIBR) $(OBJS) $(EXTS) +$(EXE) : $(LIBR) $(OBJS) $(GEM_ARCHIVE_FILES) $(EXTS) $(LL) -o $@ $(LDFLAGS) $(OBJS) $(LIBR) $(GEM_ARCHIVE_FILES) $(EXTS) $(LIBS) -include $(OBJS:.o=.d) |