diff --git a/Directory.Build.props b/Directory.Build.props index 85d96a3bf9..0e999609e0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -33,6 +33,9 @@ Spectre + + "$(VsInstallRoot)\VC\Tools\Llvm\bin\clang.exe" + true diff --git a/tests/sample/sample.vcxproj b/tests/sample/sample.vcxproj index d16a8e83bc..5378358e2b 100644 --- a/tests/sample/sample.vcxproj +++ b/tests/sample/sample.vcxproj @@ -172,7 +172,7 @@ CppCode - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c %(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c %(Filename).c -o $(OutputPath)%(Filename).o pushd $(OutDir) powershell -NonInteractive -ExecutionPolicy Unrestricted .\Convert-BpfToNative.ps1 -FileName %(Filename) -IncludeDir $(SolutionDir)\include -Platform $(Platform) -Configuration $(KernelConfiguration) -KernelMode $true powershell -NonInteractive -ExecutionPolicy Unrestricted .\Convert-BpfToNative.ps1 -FileName %(Filename) -IncludeDir $(SolutionDir)\include -Platform $(Platform) -Configuration $(Configuration) -KernelMode $false @@ -203,7 +203,7 @@ CppCode - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -I. -I../../undocked/tests/sample/ext/inc -c undocked\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -I. -I../../undocked/tests/sample/ext/inc -c undocked\%(Filename).c -o $(OutputPath)%(Filename).o pushd $(OutDir) powershell -NonInteractive -ExecutionPolicy Unrestricted .\Convert-BpfToNative.ps1 -FileName %(Filename) -IncludeDir $(SolutionDir)\include -Platform $(Platform) -Configuration $(KernelConfiguration) -KernelMode $true powershell -NonInteractive -ExecutionPolicy Unrestricted .\Convert-BpfToNative.ps1 -FileName %(Filename) -IncludeDir $(SolutionDir)\include -Platform $(Platform) -Configuration $(Configuration) -KernelMode $false @@ -218,9 +218,9 @@ CppCode - clang $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o $(OutputPath)%(Filename).o @@ -228,9 +228,9 @@ CppCode - clang $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o $(OutputPath)%(Filename).o @@ -238,9 +238,9 @@ CppCode - clang $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o $(OutputPath)%(Filename).o @@ -248,9 +248,9 @@ CppCode - clang $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o $(OutputPath)%(Filename).o true @@ -259,9 +259,9 @@ CppCode - clang $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -c %(Filename).c -o $(OutputPath)%(Filename).o - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c unsafe\%(Filename).c -o $(OutputPath)%(Filename).o $(OutputPath)%(Filename).o true @@ -272,7 +272,7 @@ CppCode - clang $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c custom_program_type\%(Filename).c -o $(OutputPath)%(Filename).o + $(ClangExec) $(ClangFlags) -I../xdp -I../socket -I./ext/inc -I../../netebpfext -c custom_program_type\%(Filename).c -o $(OutputPath)%(Filename).o pushd $(SolutionDir)\scripts powershell -NonInteractive -ExecutionPolicy Unrestricted .\build_custom_sample_programs.ps1 -FileName %(Filename) -FilePath $(OutDir) -IncludePath $(SolutionDir)\include -Platform $(Platform) -Configuration $(Configuration) -KernelConfiguration $(KernelConfiguration) popd