Merge pull request grpc#1901 from jtattermusch/fix_jenkins_win

Fix jenkins build on windows
johnsonlrd · Jun 3, 2015 · 8507e15 · 8507e15
2 parents 9bc61bd + a959e64
commit 8507e15
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh
@@ -50,6 +50,9 @@ elif [ "$platform" == "windows" ]
 then
   echo "building $language on Windows"
 
+  # Prevent msbuild from picking up "platform" env variable, which would break the build
+  unset platform
+
   # TODO(jtattermusch): integrate nuget restore in a nicer way.
   /cygdrive/c/nuget/nuget.exe restore vsprojects/grpc.sln
   /cygdrive/c/nuget/nuget.exe restore src/csharp/Grpc.sln