|
Line
Link Here
|
| 0 |
-- a/tools/gcc.jam |
0 |
++ b/tools/gcc.jam |
|
Lines 220-226
Link Here
|
| 220 |
# right onces. Note that we do not provide a clean way to build a 32-bit |
220 |
# right onces. Note that we do not provide a clean way to build a 32-bit |
| 221 |
# binary using a 64-bit compiler, but user can always pass -m32 |
221 |
# binary using a 64-bit compiler, but user can always pass -m32 |
| 222 |
# manually. |
222 |
# manually. |
| 223 |
local lib_path = $(root)/bin $(root)/lib $(root)/lib32 $(root)/lib64 ; |
223 |
local lib_path = $(root)/bin $(root)/lib $(root)/lib32 $(root)/libx32 $(root)/lib64 ; |
| 224 |
if $(.debug-configuration) |
224 |
if $(.debug-configuration) |
| 225 |
{ |
225 |
{ |
| 226 |
ECHO notice: using gcc libraries :: $(condition) :: $(lib_path) ; |
226 |
ECHO notice: using gcc libraries :: $(condition) :: $(lib_path) ; |
|
Lines 469-474
Link Here
|
| 469 |
{ |
469 |
{ |
| 470 |
option = -m32 ; |
470 |
option = -m32 ; |
| 471 |
} |
471 |
} |
|
|
472 |
else if $(model) = 32_64 |
| 473 |
{ |
| 474 |
option = -mx32 ; |
| 475 |
} |
| 472 |
else if $(model) = 64 |
476 |
else if $(model) = 64 |
| 473 |
{ |
477 |
{ |
| 474 |
option = -m64 ; |
478 |
option = -m64 ; |
| 475 |
-- a/tools/gcc.py |
479 |
++ b/tools/gcc.py |
|
Lines 162-167
Link Here
|
| 162 |
lib_path = [os.path.join(root, 'bin'), |
162 |
lib_path = [os.path.join(root, 'bin'), |
| 163 |
os.path.join(root, 'lib'), |
163 |
os.path.join(root, 'lib'), |
| 164 |
os.path.join(root, 'lib32'), |
164 |
os.path.join(root, 'lib32'), |
|
|
165 |
os.path.join(root, 'libx32'), |
| 165 |
os.path.join(root, 'lib64')] |
166 |
os.path.join(root, 'lib64')] |
| 166 |
if debug(): |
167 |
if debug(): |
| 167 |
print 'notice: using gcc libraries ::', condition, '::', lib_path |
168 |
print 'notice: using gcc libraries ::', condition, '::', lib_path |
|
Lines 744-749
Link Here
|
| 744 |
# |
745 |
# |
| 745 |
# x86 and compatible |
746 |
# x86 and compatible |
| 746 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32']) |
747 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32']) |
|
|
748 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32_64'], ['-mx32']) |
| 747 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64']) |
749 |
flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64']) |
| 748 |
cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native']) |
750 |
cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native']) |
| 749 |
cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486']) |
751 |
cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486']) |
