projects / platform / upstream / dotnet / runtime.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9e371f6)
Fix build error with space in pathFix buildtools restore with paths with spaces
authorViktor <viktor.hofer@microsoft.com>
Wed, 2 Jan 2019 16:51:05 +0000 (17:51 +0100)
committerViktor Hofer <viktor.hofer@microsoft.com>
Fri, 4 Jan 2019 22:26:50 +0000 (23:26 +0100)
Commit migrated from https://github.com/dotnet/corefx/commit/76ad9b00cc1b7d7ed40b16934d534df756c0ffed

src/libraries/Native/build-native.cmd patch | blob | history
src/libraries/Native/build-native.proj patch | blob | history

diff --git a/src/libraries/Native/build-native.cmd b/src/libraries/Native/build-native.cmd
index 4bbb4dc..60c02f0 100644 (file)
--- a/src/libraries/Native/build-native.cmd
+++ b/src/libraries/Native/build-native.cmd
@@ -146,7 +146,7 @@ exit /b 1
 :: Regenerate the VS solution
 
 pushd "%__IntermediatesDir%"
-call "%__nativeWindowsDir%\gen-buildsys-win.bat" %__nativeWindowsDir% %__VSVersion% %__BuildArch%
+call "%__nativeWindowsDir%\gen-buildsys-win.bat" "%__nativeWindowsDir%" %__VSVersion% %__BuildArch%
 popd
 
 :CheckForProj
@@ -177,7 +177,7 @@ set "__LinkArgs=%__LinkArgs% /APPCONTAINER"
 set "__appContainer=true"
 
 pushd "%__IntermediatesDir%"
-call "%__nativeWindowsDir%\gen-buildsys-win.bat" %__nativeWindowsDir% %__VSVersion% %__BuildArch%
+call "%__nativeWindowsDir%\gen-buildsys-win.bat" "%__nativeWindowsDir%" %__VSVersion% %__BuildArch%
 popd
 
 if not exist "%__IntermediatesDir%\install.vcxproj" goto :Failure
@@ -198,8 +198,8 @@ IF ERRORLEVEL 1 (
 )
 
 :: Copy results to native_aot since packaging expects a copy there too
-mkdir %__artifactsDir%\bin\native\%__outConfig%-aot
-copy %__artifactsDir%\bin\native\%__outConfig%\* %__artifactsDir%\bin\native\%__outConfig%-aot\
+mkdir "%__artifactsDir%\bin\native\%__outConfig%-aot"
+copy "%__artifactsDir%\bin\native\%__outConfig%\*" "%__artifactsDir%\bin\native\%__outConfig%-aot"
 
 exit /B 0
 
diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj
index df323f0..325bd47 100644 (file)
--- a/src/libraries/Native/build-native.proj
+++ b/src/libraries/Native/build-native.proj
@@ -42,7 +42,7 @@
     </PropertyGroup>
 
     <!-- Run script that invokes Cmake to create VS files, and then calls msbuild to compile them -->
-    <Message Text="$(MSBuildProjectDirectory)\build-native.cmd $(_BuildNativeArgs)" Importance="High"/>
+    <Message Text="&quot;$(MSBuildProjectDirectory)\build-native.cmd&quot; $(_BuildNativeArgs)" Importance="High"/>
     <Exec Command="&quot;$(MSBuildProjectDirectory)\build-native.cmd&quot; $(_BuildNativeArgs)" />
 
   </Target>
Domain: Dotnet / Core;