1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setup.mak: make Makefile stable

Browse Source 
* win32/setup.mak (-basic-vars-): moved BASERUBY and HAVE_BASERUBY
  definition to make Makefile stable when they have been defaulted.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-12-03 04:41:06 +00:00
parent 99d7138743
commit e61e19a2fe
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
win32/setup.mak
View File

@ -48,12 +48,9 @@ EXTSTATIC = $(EXTSTATIC)
!if defined(RDOCTARGET) !if defined(RDOCTARGET)
RDOCTARGET = $(RDOCTARGET) RDOCTARGET = $(RDOCTARGET)
!endif !endif
!if defined(EXTOUT) !if defined(EXTOUT) && "$(EXTOUT)" != ".ext"
EXTOUT = $(EXTOUT) EXTOUT = $(EXTOUT)
!endif !endif
!if defined(BASERUBY)
BASERUBY = $(BASERUBY:/=\)
!endif
!if defined(NTVER) !if defined(NTVER)
NTVER = $(NTVER) NTVER = $(NTVER)
!endif !endif
@ -66,19 +63,21 @@ ENABLE_DEBUG_ENV = $(ENABLE_DEBUG_ENV)
# TOOLS # TOOLS
<< <<
!if !defined(BASERUBY) !if defined(BASERUBY)
@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE) @echo BASERUBY = $(BASERUBY:/=\)>> $(MAKEFILE)
@echo !if "$$(BASERUBY)" == "">> $(MAKEFILE)
@echo BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 >> $(MAKEFILE)
@echo HAVE_BASERUBY = no>> $(MAKEFILE)
@echo !else>> $(MAKEFILE)
@echo HAVE_BASERUBY = yes>> $(MAKEFILE)
@echo !endif>> $(MAKEFILE)
!elseif [$(BASERUBY) -eexit 2> nul] == 0
@echo HAVE_BASERUBY = yes>> $(MAKEFILE)
!else !else
@echo HAVE_BASERUBY = no>> $(MAKEFILE) @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)
!endif !endif
@type << >> $(MAKEFILE)
$(BANG)if "$$(BASERUBY)" == ""
BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1
HAVE_BASERUBY = no
$(BANG)elseif [$$(BASERUBY) -eexit 2> nul] == 0
HAVE_BASERUBY = yes
$(BANG)else
HAVE_BASERUBY = no
$(BANG)endif
<<
!if "$(GIT)" != "" !if "$(GIT)" != ""
@echo GIT = $(GIT)>> $(MAKEFILE) @echo GIT = $(GIT)>> $(MAKEFILE)
!endif !endif