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

setup.mak: -osname-

Browse Source 
* win32/setup.mak (-osname-): separate from -runtime- and just
  compile.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-11 10:21:52 +00:00
parent 101d458fdf
commit 51914fcce6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
win32/setup.mak
View File

@ -70,7 +70,7 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
@echo !endif>> $(MAKEFILE) @echo !endif>> $(MAKEFILE)
!endif !endif
-system-vars-: -runtime- -system-vars-: -osname- -runtime-
-system-vars32-: -osname32- -runtime- -system-vars32-: -osname32- -runtime-
@ -82,6 +82,16 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
-osname64-: nul -osname64-: nul
@echo TARGET_OS = mswin64 >>$(MAKEFILE) @echo TARGET_OS = mswin64 >>$(MAKEFILE)
-osname-: nul
@echo !ifndef TARGET_OS>>$(MAKEFILE)
@($(CC) -c <<conftest.c > nul && (echo TARGET_OS = mswin32) || (echo TARGET_OS = mswin64)) >>$(MAKEFILE)
#ifdef _WIN64
#error
#endif
<<
@echo !endif>>$(MAKEFILE)
@$(WIN32DIR:/=\)\rm.bat conftest.*
-runtime-: nul -runtime-: nul
@$(CC) -MD <<rtname.c user32.lib -link > nul @$(CC) -MD <<rtname.c user32.lib -link > nul
#include <windows.h> #include <windows.h>
@ -126,13 +136,6 @@ runtime_name()
ver = p; ver = p;
} }
} }
printf("!ifndef TARGET_OS\n");
#ifdef _WIN64
printf("TARGET_OS = mswin64\n");
#else
printf("TARGET_OS = mswin32\n");
#endif
printf("!endif\n");
if (ver) { if (ver) {
printf("PLATFORM = $$(TARGET_OS)_%s\n", ver); printf("PLATFORM = $$(TARGET_OS)_%s\n", ver);
} }