]>
Commit | Line | Data |
---|---|---|
a8d8c602 JB |
1 | --- boost_1_35_0/tools/build/v2/util/os.jam.org 2007-06-16 15:29:24.717971888 +0200 |
2 | +++ boost_1_35_0/tools/build/v2/util/os.jam 2007-06-16 15:31:19.139516164 +0200 | |
3 | @@ -129,22 +129,7 @@ | |
cdf6c610 | 4 | # Returns true if running on windows, whether in cygwin or not. |
a8d8c602 | 5 | rule on-windows ( ) |
cdf6c610 ŁK |
6 | { |
7 | - local result ; | |
a8d8c602 | 8 | - if [ modules.peek : NT ] |
cdf6c610 ŁK |
9 | - { |
10 | - result = true ; | |
11 | - } | |
a8d8c602 | 12 | - else if [ modules.peek : UNIX ] |
cdf6c610 | 13 | - { |
a8d8c602 | 14 | - switch [ modules.peek : JAMUNAME ] |
cdf6c610 ŁK |
15 | - { |
16 | - case CYGWIN* : | |
17 | - { | |
18 | - result = true ; | |
19 | - } | |
20 | - } | |
21 | - } | |
22 | - return $(result) ; | |
23 | + return true ; | |
24 | } | |
5fc4cf3a | 25 | |
a8d8c602 JB |
26 | |
27 | --- boost_1_35_0/tools/build/v2/tools/gcc.jam.org 2007-06-16 15:32:31.064543550 +0200 | |
28 | +++ boost_1_35_0/tools/build/v2/tools/gcc.jam 2007-06-16 15:32:37.304591591 +0200 | |
29 | @@ -325,7 +325,7 @@ | |
30 | # Yet another alternative would be to create propagated <sharedable> | |
31 | # feature, and set it when building shared libraries, but that's hard to | |
32 | # implement and will increase target path length even more. | |
cdf6c610 ŁK |
33 | - flags gcc.compile OPTIONS <link>shared : -fPIC ; |
34 | + #flags gcc.compile OPTIONS <link>shared : -fPIC ; | |
a8d8c602 JB |
35 | } |
36 | if [ os.name ] != NT && [ os.name ] != OSF && [ os.name ] != HPUX | |
5fc4cf3a | 37 | { |
9bb5db3e JB |
38 | --- boost_1_36_0/tools/build/v2/user-config.jam.orig 2008-07-15 15:53:41.000000000 +0200 |
39 | +++ boost_1_36_0/tools/build/v2/user-config.jam 2008-08-23 09:29:58.862617801 +0200 | |
40 | @@ -40,7 +40,7 @@ | |
41 | # ------------------ | |
cdf6c610 | 42 | |
9bb5db3e JB |
43 | # Configure gcc (default version). |
44 | -# using gcc ; | |
cdf6c610 ŁK |
45 | +using gcc : : i386-mingw32-g++ : ; |
46 | ||
9bb5db3e JB |
47 | # Configure specific gcc version, giving alternative name to use. |
48 | # using gcc : 3.2 : g++-3.2 ; |