blob: d086fa6d9bb50b8e2600b09a9abfabeebb823111 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- libs/thread/build/Jamfile.v2.mingw 2012-12-04 15:05:00.027057650 +0100
+++ libs/thread/build/Jamfile.v2 2012-12-04 15:05:22.488292220 +0100
@@ -101,7 +101,8 @@
local rule default_threadapi ( )
{
local api = pthread ;
- if [ os.name ] = "NT" { api = win32 ; }
+ #if [ os.name ] = "NT" { api = win32 ; }
+ api = win32 ;
return $(api) ;
}
--- libs/context/build/Jamfile.v2.orig 2013-03-03 13:39:59.684868916 +0100
+++ libs/context/build/Jamfile.v2 2013-03-03 15:09:09.893232829 +0100
@@ -45,10 +45,11 @@
local rule default_binary_format ( )
{
local tmp = elf ;
- if [ os.name ] = "NT" { tmp = pe ; }
- else if [ os.name ] = "CYGWIN" { tmp = pe ; }
- else if [ os.name ] = "AIX" { tmp = xcoff ; }
- else if [ os.name ] = "MACOSX" { tmp = mach-o ; }
+ #if [ os.name ] = "NT" { tmp = pe ; }
+ #else if [ os.name ] = "CYGWIN" { tmp = pe ; }
+ #else if [ os.name ] = "AIX" { tmp = xcoff ; }
+ #else if [ os.name ] = "MACOSX" { tmp = mach-o ; }
+ tmp = pe ;
return $(tmp) ;
}
@@ -65,10 +66,11 @@
local rule default_abi ( )
{
local tmp = sysv ;
- if [ os.name ] = "NT" { tmp = ms ; }
- else if [ os.name ] = "CYGWIN" { tmp = ms ; }
- else if [ os.platform ] = "ARM" { tmp = aapcs ; }
- else if [ os.platform ] = "MIPS" { tmp = o32 ; }
+ #if [ os.name ] = "NT" { tmp = ms ; }
+ #else if [ os.name ] = "CYGWIN" { tmp = ms ; }
+ #else if [ os.platform ] = "ARM" { tmp = aapcs ; }
+ #else if [ os.platform ] = "MIPS" { tmp = o32 ; }
+ tmp = ms ;
return $(tmp) ;
}
|