diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-07 06:23:15 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-07 06:23:15 +0000 |
| commit | 6e4b187bfe582614a491008a68292e8e67a6cfb0 (patch) | |
| tree | 09feb0712a3585ff96cc2af09c343836d15d7a99 /win32/Makefile.sub | |
| parent | 8f1be270179f771b517d551fe1ce3d12234f0324 (diff) | |
* Makefile.in, common.mk (fake, yes-fake, no-make): these dependecies
are not platform dependent.
* win32/Makefile.sub ($(arch)-fake.rb): workaround.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 33756830c1..3f62197cfb 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -13,7 +13,7 @@ MFLAGS=-l !endif !ifndef CROSS_COMPILING -CROSS_COMPILING = 0 +CROSS_COMPILING = no !endif !ifndef LARGEFILE_SUPPORT LARGEFILE_SUPPORT = 1 @@ -269,8 +269,8 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT) !endif RUBYDEF = $(RUBY_SO_NAME).def -!if $(CROSS_COMPILING) -MINIRUBY = $(RUBY) -I$(MAKEDIR) -rfake +!if "$(CROSS_COMPILING)" == "yes" +MINIRUBY = $(RUBY) -I$(MAKEDIR) -r$(arch)-fake RUNRUBY = $(MINIRUBY) !else MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I. @@ -278,7 +278,7 @@ RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I. !endif MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT) RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS) -!if $(CROSS_COMPILING) +!if "$(CROSS_COMPILING)" == "yes" XRUBY = $(MINIRUBY) !else XRUBY = $(RUNRUBY) @@ -317,8 +317,8 @@ LIBRUBY_RELATIVE = yes THREAD_MODEL = win32 -!if $(CROSS_COMPILING) -PREP = fake.rb +!if "$(CROSS_COMPILING)" == "yes" +PREP = $(arch)-fake.rb !else PREP = miniruby$(EXEEXT) !endif @@ -984,7 +984,7 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb -so_name=$(RUBY_SO_NAME) \ . $(icondirs) $(win_srcdir) -fake.rb: $(MKFILES) +$(arch)-fake.rb: $(MKFILES) @echo Creating <<$@ class Object CROSS_COMPILING = RUBY_PLATFORM |