Commit 89e13eca authored by scottmg@chromium.org's avatar scottmg@chromium.org

Link chrome.exe to its IntDir and then hardlink to OutDir as a

postbuild on msvs. This avoids a clash between the .ilk files
for chrome.exe and chrome.dll which disables incremental linking
for chrome_dll.


BUG=92528
TEST=No new functionality, no link/run problems


Review URL: http://codereview.chromium.org/7633024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97074 0039d316-1c4b-4281-b951-d872f2087c98
parent e71d5327
...@@ -45,19 +45,6 @@ ...@@ -45,19 +45,6 @@
}, },
'conditions': [ 'conditions': [
['OS=="win"', { ['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': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'DelayLoadDLLs': [ 'DelayLoadDLLs': [
...@@ -464,6 +451,20 @@ ...@@ -464,6 +451,20 @@
}, },
}, },
}], }],
# Linking to $(IntDir) and then hard-linking back to $(OutDir) is a
# workaround to avoid having the .ilk files for chrome.dll and
# chrome.exe conflicting. See http://crbug.com/92528 for background.
# Only done on 2008 currently because msvs_postbuild isn't implemented
# on 2010 yet, and this hack may not be required there anyway.
['OS=="win" and MSVS_VERSION=="2008"', {
'msvs_settings': {
'VCLinkerTool': {
'OutputFile': '$(IntDir)\\chrome.exe',
},
},
'msvs_postbuild': 'tools\\build\\win\\hardlink_failsafe.bat $(IntDir)\\chrome.exe $(OutDir)\\chrome.exe'
}],
], ],
}, },
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment