Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(422)

Unified Diff: chrome/chrome_exe.gypi

Issue 7634025: Build chrome.exe into intermediate dir then copy it to output dir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: switch to hardlink_failsafe.bat Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi (revision 96354)
+++ chrome/chrome_exe.gypi (working copy)
@@ -45,19 +45,6 @@
},
'conditions': [
['OS=="win"', {
- # TODO(scottbyer): This is a temporary workaround. The right fix
- # is to change the output file to be in $(IntDir) for this project
- # and the .dll project and use the hardlink script to link it back
- # to $(OutDir).
- 'configurations': {
- 'Debug_Base': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'LinkIncremental': '1',
- },
- },
- },
- },
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [
@@ -461,8 +448,18 @@
'VCLinkerTool': {
'ImportLibrary': '$(OutDir)\\lib\\chrome_exe.lib',
'ProgramDatabaseFile': '$(OutDir)\\chrome_exe.pdb',
+ # In order to support incremental linking for both chrome exe and
+ # dll we need to build them to different directories (otherwise
+ # both files are called chrome.ilk and collide in the output
+ # directory. We build chrome.exe to the intermediate directory
+ # and add a postbuild step (below) to link the resulting
+ # executable into the output dir. http://crbug.com/92528
+ 'OutputFile': '$(IntDir)\\chrome.exe',
},
},
+ 'msvs_postbuild': [
+ 'tools\\build\\win\\hardlink_failsafe.bat "$(IntDir)\\chrome.exe" "$(OutDir)\\chrome.exe"',
+ ],
}],
],
},
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698