visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs - Issue 66333012: [NaCl AddIn] Update location of PNaCl executables.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

Issue 66333012: [NaCl AddIn] Update location of PNaCl executables. (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets ('k') | visual_studio/NativeClientVSAddIn/buildbot_run.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

diff --git a/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs b/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

index 9f607ceb4d68dc70215c6ab69cb4ea7ea6847ced..383876425969334df4fe885401d5fdde9de1f684 100644

--- a/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

+++ b/visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs

@@ -226,7 +226,6 @@ namespace NaCl.Build.CPPTasks

// The SDK root is five levels up from the compiler binary.

string sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(pathToTool));

sdkroot = Path.GetDirectoryName(Path.GetDirectoryName(sdkroot));

- sdkroot = Path.GetDirectoryName(sdkroot);

if (!SDKUtilities.SupportsPNaCl(sdkroot))

{