Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 2630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2641 # so the normal gyp path-munging fails us. This hack | 2641 # so the normal gyp path-munging fails us. This hack |
| 2642 # gets the right path. | 2642 # gets the right path. |
| 2643 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', | 2643 'gold_path': '<(PRODUCT_DIR)/../../third_party/gold', |
| 2644 }, { | 2644 }, { |
| 2645 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/thir d_party/gold', | 2645 'gold_path': '<(PRODUCT_DIR)/../../Source/WebKit/chromium/thir d_party/gold', |
| 2646 }] | 2646 }] |
| 2647 ] | 2647 ] |
| 2648 }, | 2648 }, |
| 2649 'ldflags': [ | 2649 'ldflags': [ |
| 2650 # Put our gold binary in the search path for the linker. | 2650 # Put our gold binary in the search path for the linker. |
| 2651 '-B<(gold_path)', | 2651 '-B<(gold_path) -m32', |
|
Roland McGrath
2012/10/11 18:04:05
Why do you think this is needed?
-m32 already appe
robertm
2012/10/11 19:28:43
The problem is that I need to force the host compi
Roland McGrath
2012/10/11 20:00:35
If it's for the host, then shouldn't it be inside
| |
| 2652 ], | 2652 ], |
| 2653 }], | 2653 }], |
| 2654 ], | 2654 ], |
| 2655 }, | 2655 }, |
| 2656 }], | 2656 }], |
| 2657 # FreeBSD-specific options; note that most FreeBSD options are set above, | 2657 # FreeBSD-specific options; note that most FreeBSD options are set above, |
| 2658 # with Linux. | 2658 # with Linux. |
| 2659 ['OS=="freebsd"', { | 2659 ['OS=="freebsd"', { |
| 2660 'target_defaults': { | 2660 'target_defaults': { |
| 2661 'ldflags': [ | 2661 'ldflags': [ |
| (...skipping 959 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3621 # settings in target dicts. SYMROOT is a special case, because many other | 3621 # settings in target dicts. SYMROOT is a special case, because many other |
| 3622 # Xcode variables depend on it, including variables such as | 3622 # Xcode variables depend on it, including variables such as |
| 3623 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3623 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3624 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3624 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3625 # files to appear (when present) in the UI as actual files and not red | 3625 # files to appear (when present) in the UI as actual files and not red |
| 3626 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3626 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3627 # and therefore SYMROOT, needs to be set at the project level. | 3627 # and therefore SYMROOT, needs to be set at the project level. |
| 3628 'SYMROOT': '<(DEPTH)/xcodebuild', | 3628 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3629 }, | 3629 }, |
| 3630 } | 3630 } |
| OLD | NEW |