win: Remove msbuild_toolset, and msvs-specific ProgramDatabaseFile.
Since we're now on ninja, they don't have an effect. BUG=none R=scottmg@chromium.org Review URL: https://codereview.chromium.org/145493007 git-svn-id: http://src.chromium.org/svn/trunk/src/build@246783 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
96b4c2d4c3
Коммит
39a2338132
16
common.gypi
16
common.gypi
|
@ -1199,9 +1199,6 @@
|
||||||
# Disable Dart by default.
|
# Disable Dart by default.
|
||||||
'enable_dart%': 0,
|
'enable_dart%': 0,
|
||||||
|
|
||||||
# The desired version of Windows SDK can be set in ~/.gyp/include.gypi.
|
|
||||||
'msbuild_toolset%': '',
|
|
||||||
|
|
||||||
# Native Client is enabled by default.
|
# Native Client is enabled by default.
|
||||||
'disable_nacl%': 0,
|
'disable_nacl%': 0,
|
||||||
|
|
||||||
|
@ -2092,9 +2089,6 @@
|
||||||
# See http://crbug.com/162818.
|
# See http://crbug.com/162818.
|
||||||
'cflags+': ['-Wno-sentinel'],
|
'cflags+': ['-Wno-sentinel'],
|
||||||
}],
|
}],
|
||||||
['OS=="win" and "<(msbuild_toolset)"!=""', {
|
|
||||||
'msbuild_toolset': '<(msbuild_toolset)',
|
|
||||||
}],
|
|
||||||
['branding=="Chrome"', {
|
['branding=="Chrome"', {
|
||||||
'defines': ['GOOGLE_CHROME_BUILD'],
|
'defines': ['GOOGLE_CHROME_BUILD'],
|
||||||
}, { # else: branding!="Chrome"
|
}, { # else: branding!="Chrome"
|
||||||
|
@ -2364,16 +2358,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}],
|
}],
|
||||||
['"<(GENERATOR)"=="msvs"', {
|
|
||||||
'msvs_settings': {
|
|
||||||
'VCLinkerTool': {
|
|
||||||
# Make the pdb name sane. Otherwise foo.exe and foo.dll both
|
|
||||||
# have foo.pdb. The ninja generator already defaults to this and
|
|
||||||
# can't handle the $(TargetPath) macro.
|
|
||||||
'ProgramDatabaseFile': '$(TargetPath).pdb',
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}],
|
|
||||||
], # win_z7!=0
|
], # win_z7!=0
|
||||||
}], # OS==win
|
}], # OS==win
|
||||||
['enable_task_manager==1', {
|
['enable_task_manager==1', {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче