diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/python2/007-fix-build-path.patch | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/python2/007-fix-build-path.patch')
| -rw-r--r-- | ports/python2/007-fix-build-path.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ports/python2/007-fix-build-path.patch b/ports/python2/007-fix-build-path.patch new file mode 100644 index 000000000..5dc4633e0 --- /dev/null +++ b/ports/python2/007-fix-build-path.patch @@ -0,0 +1,14 @@ +diff --git a/PCbuild/python.props b/PCbuild/python.props
+index d2b1991..a22c054 100644
+--- a/PCbuild/python.props
++++ b/PCbuild/python.props
+@@ -26,8 +26,7 @@
+ <PySourcePath Condition="!HasTrailingSlash($(PySourcePath))">$(PySourcePath)\</PySourcePath>
+
+ <!-- Directory where build outputs are put -->
+- <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\</BuildPath>
+- <BuildPath Condition="'$(ArchName)' != 'win32'">$(BuildPath)\$(ArchName)\</BuildPath>
++ <BuildPath Condition="'$(BuildPath)' == ''">$(PySourcePath)PCBuild\$(ArchName)\</BuildPath>
+ <BuildPath Condition="!HasTrailingSlash($(BuildPath))">$(BuildPath)\</BuildPath>
+
+ <!-- Directories of external projects. tcltk is handled in tcltk.props -->
|