Centralize which version of clang to use (#125)

Signed-off-by: Alan Jowett <[email protected]> Co-authored-by: Alan Jowett <[email protected]>
microsoft · Sep 25, 2024 · b5c7489 · b5c7489
1 parent 0d8ed59
commit b5c7489
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -16,6 +16,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(AddressSanitizer)'=='True' And '$(MSBuildProjectExtension)'!='.csproj'">
     <EnableASAN>true</EnableASAN>
+  </PropertyGroup>
+    <PropertyGroup>
+    <ClangExec>"$(VsInstallRoot)\VC\Tools\Llvm\bin\clang.exe"</ClangExec>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

diff --git a/tools/netevent_monitor/netevent_monitor.vcxproj b/tools/netevent_monitor/netevent_monitor.vcxproj
@@ -161,7 +161,7 @@ $(Outdir)netevent_ebpf_ext_export_program_info.exe</Command>
       <FileType>CppCode</FileType>
       <Outputs>$(OutputPath)netevent_monitor.o</Outputs>
       <Command>
-        clang $(ClangFlags) $(ClangIncludes) -I$(SolutionDir)include -c bpf\netevent_monitor.c -o $(OutputPath)netevent_monitor.o
+        $(ClangExec) $(ClangFlags) $(ClangIncludes) -I$(SolutionDir)include -c bpf\netevent_monitor.c -o $(OutputPath)netevent_monitor.o
         pushd $(OutDir)
         powershell -NonInteractive -ExecutionPolicy Unrestricted $(EbpfBinPath)\Convert-BpfToNative.ps1 -FileName %(Filename) -Type netevent_monitor -IncludeDir $(EbpfIncludePath) -Platform $(Platform) -Configuration $(Configuration)
         popd

diff --git a/tools/process_monitor_bpf/process_monitor_bpf.vcxproj b/tools/process_monitor_bpf/process_monitor_bpf.vcxproj
@@ -92,7 +92,7 @@ $(Outdir)ntos_ebpf_ext_export_program_info.exe</Command>
       <FileType>CppCode</FileType>
       <Outputs>$(OutputPath)process_monitor.o</Outputs>
       <Command>
-        clang $(ClangFlags) $(ClangIncludes) -I$(SolutionDir)include -c process_monitor.c -o $(OutputPath)process_monitor.o
+        $(ClangExec) $(ClangFlags) $(ClangIncludes) -I$(SolutionDir)include -c process_monitor.c -o $(OutputPath)process_monitor.o
         pushd $(OutDir)
         powershell -NonInteractive -ExecutionPolicy Unrestricted $(EbpfBinPath)\Convert-BpfToNative.ps1 -FileName %(Filename) -Type process -IncludeDir $(EbpfIncludePath) -Platform $(Platform) -Configuration $(Configuration)
         popd