diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-21 08:32:34 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-07-21 08:32:34 +0000 |
commit | 7fc32bf84acf6bb4041edfd1fb3efcda7b1e4a71 (patch) | |
tree | c148fe0f5950da61563e314ea509781c5a630c32 /bcc32/Makefile.sub | |
parent | 24ec25c58e20cf6b8bfb851babd9368f1e8b83c8 (diff) | |
download | ruby-7fc32bf84acf6bb4041edfd1fb3efcda7b1e4a71.tar.gz ruby-7fc32bf84acf6bb4041edfd1fb3efcda7b1e4a71.tar.xz ruby-7fc32bf84acf6bb4041edfd1fb3efcda7b1e4a71.zip |
* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
support.
* bcc32/setup.mak: check runtime version.
* win32/win32.c (rb_w32_open_osfhandle): prototype has changed
in bcc 5.82.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bcc32/Makefile.sub')
-rw-r--r-- | bcc32/Makefile.sub | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 67e9e5885..567050972 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -4,8 +4,12 @@ SHELL = $(COMSPEC) MKFILES = Makefile #### Start of system configuration section. #### +!ifndef OS OS = bccwin32 -RT = $(OS) +!endif +!if !defined(RT) +!error RT not defined. Retry from configure pass. +!endif ## variables may be overridden by $(compile_dir)/Makefile !ifndef srcdir @@ -144,7 +148,7 @@ STACK = 0x2000000 XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing -ARFLAGS = /a +ARFLAGS = /a /p32 LD = ilink32 -q -Gn LDSHARED = $(LD) XLDFLAGS = -Tpe c0x32.obj @@ -209,7 +213,13 @@ rubyw: $(WPROGRAM) !include $(srcdir)/common.mk -PHONY: Makefile +$(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak + $(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args) + @echo $(MKFILES) should be updated, re-run $(MAKE). + @$(MAKE) > nul -q -f &&| +PHONY: nul + @exit +| CONFIG_H = ./.config.h.time |