diff options
| author | Jo Shields <jo.shields@xamarin.com> | 2015-09-25 11:55:44 +0300 |
|---|---|---|
| committer | Jo Shields <jo.shields@xamarin.com> | 2015-09-25 11:58:34 +0300 |
| commit | 900552b7d344c9fc75b7b4b4ab70ebd3f4a397e5 (patch) | |
| tree | 2cd8a960b40c497b78bc53dd5fafe69fa21d19b3 /msvc/libmonoutils.vcxproj | |
| parent | 2cc07eaa9d7570ac434d278f3a6429294d41f334 (diff) | |
Bundle modified masm.props with fully qualified ml.exe call.
In some more esoteric environments (say bash.exe spawned by
jenkins-slave.exe), the _MASM target's attempts to call ml.exe fail
due to ml.exe missing from $PATH (even when it appears to be fine).
The ClCompile target doesn't suffer this issue, since it uses the
full path to CL.exe rather than assuming CL.exe is in $PATH.
Bundle a lightly patched masm.props to duplicate the ClCompile
target behaviour.
This should have no impact on you unless for some reason you're
using a different MASM to the one provided with MSVC.
Diffstat (limited to 'msvc/libmonoutils.vcxproj')
| -rw-r--r-- | msvc/libmonoutils.vcxproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index 615183c02df..939f52048d7 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -185,7 +185,7 @@ </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
- <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+ <Import Project=".\masm.fixed.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -302,4 +302,4 @@ <ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
\ No newline at end of file +</Project>
|