Skip to content

Commit 35320ba

Browse files
committed
Add Compile metadata at the end so it doesn't get overwritten.
1 parent 11754cd commit 35320ba

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/IKVM.Clang.Sdk/targets/IKVM.Clang.Core.targets

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,57 +334,57 @@
334334
<_Args Include="-x;$(_Language)" Condition=" '$(_Language)' != '' " />
335335

336336
<_SystemRootDirectories Remove="@(_SystemRootDirectories)" />
337-
<_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" />
338337
<_SystemRootDirectories Include="@(SystemRootDirectories)" />
339338
<_SystemRootDirectories Include="$(SystemRootDirectories)" />
339+
<_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" />
340340
<_SystemRootDirectoriesTemp Remove="@(_SystemRootDirectoriesTemp)" />
341341
<_SystemRootDirectoriesTemp Include="@(_SystemRootDirectories->Distinct())" />
342342
<_SystemRootDirectoriesArgs Remove="@(_SystemRootDirectoriesArgs)" />
343343
<_SystemRootDirectoriesArgs Include="@(_SystemRootDirectoriesTemp->'--sysroot')" Value="%(_SystemRootDirectoriesTemp.Identity)" Separator=" " />
344344
<_Args Include="@(_SystemRootDirectoriesArgs)" />
345345

346346
<_IncludeSystemRootDirectories Remove="@(_IncludeSystemRootDirectories)" />
347-
<_IncludeSystemRootDirectories Include="%(Compile.IncludeSystemRootDirectories)" />
348347
<_IncludeSystemRootDirectories Include="@(IncludeSystemRootDirectories)" />
349348
<_IncludeSystemRootDirectories Include="$(IncludeSystemRootDirectories)" />
349+
<_IncludeSystemRootDirectories Include="%(Compile.IncludeSystemRootDirectories)" />
350350
<_IncludeSystemRootDirectoriesTemp Remove="@(_IncludeSystemRootDirectoriesTemp)" />
351351
<_IncludeSystemRootDirectoriesTemp Include="@(_IncludeSystemRootDirectories->Distinct())" />
352352
<_IncludeSystemRootDirectoriesArgs Remove="@(_IncludeSystemRootDirectoriesArgs)" />
353353
<_IncludeSystemRootDirectoriesArgs Include="@(_IncludeSystemRootDirectoriesTemp->'-isysroot')" Value="%(_IncludeSystemRootDirectoriesTemp.Identity)" Separator=" " />
354354
<_Args Include="@(_IncludeSystemRootDirectoriesArgs)" />
355355

356356
<_SystemIncludeDirectories Remove="@(_SystemIncludeDirectories)" />
357-
<_SystemIncludeDirectories Include="%(Compile.SystemIncludeDirectories)" />
358357
<_SystemIncludeDirectories Include="@(SystemIncludeDirectories)" />
359358
<_SystemIncludeDirectories Include="$(SystemIncludeDirectories)" />
359+
<_SystemIncludeDirectories Include="%(Compile.SystemIncludeDirectories)" />
360360
<_SystemIncludeDirectoriesTemp Remove="@(_SystemIncludeDirectoriesTemp)" />
361361
<_SystemIncludeDirectoriesTemp Include="@(_SystemIncludeDirectories->Distinct())" />
362362
<_SystemIncludeDirectoriesArgs Remove="@(_SystemIncludeDirectoriesArgs)" />
363363
<_SystemIncludeDirectoriesArgs Include="@(_SystemIncludeDirectoriesTemp->'-isystem')" Value="%(_SystemIncludeDirectoriesTemp.Identity)" Separator=" " />
364364
<_Args Include="@(_SystemIncludeDirectoriesArgs)" />
365365

366366
<_IncludeDirectories Remove="@(_IncludeDirectories)" />
367-
<_IncludeDirectories Include="%(Compile.IncludeDirectories)" />
368367
<_IncludeDirectories Include="@(IncludeDirectories)" />
369368
<_IncludeDirectories Include="$(IncludeDirectories)" />
369+
<_IncludeDirectories Include="%(Compile.IncludeDirectories)" />
370370
<_IncludeDirectoriesTemp Remove="@(_IncludeDirectoriesTemp)" />
371371
<_IncludeDirectoriesTemp Include="@(_IncludeDirectories->Distinct())" />
372372
<_IncludeDirectoriesArgs Remove="@(_IncludeDirectoriesArgs)" />
373373
<_IncludeDirectoriesArgs Include="@(_IncludeDirectoriesTemp->'-I')" Value="%(_IncludeDirectoriesTemp.Identity)" Separator="" />
374374
<_Args Include="@(_IncludeDirectoriesArgs)" />
375375

376376
<_PreprocessorDefinitions Remove="@(_PreprocessorDefinitions)" />
377-
<_PreprocessorDefinitions Include="%(Compile.PreprocessorDefinitions)" />
378377
<_PreprocessorDefinitions Include="@(PreprocessorDefinitions)" />
379378
<_PreprocessorDefinitions Include="$(PreprocessorDefinitions)" />
379+
<_PreprocessorDefinitions Include="%(Compile.PreprocessorDefinitions)" />
380380
<_PreprocessorDefinitionsArgs Remove="@(_PreprocessorDefinitionsArgs)" />
381381
<_PreprocessorDefinitionsArgs Include="@(_PreprocessorDefinitions->'-D')" Value="%(_PreprocessorDefinitions.Identity)" Separator="" Value2="%(_PreprocessorDefinitions.Value)" Separator2="=" />
382382
<_Args Include="@(_PreprocessorDefinitionsArgs)" />
383383

384384
<_AdditionalOptions Remove="@(_AdditionalOptions)" />
385-
<_AdditionalOptions Include="%(Compile.AdditionalCompileOptions)" />
386385
<_AdditionalOptions Include="@(AdditionalCompileOptions)" />
387386
<_AdditionalOptions Include="$(AdditionalCompileOptions)" />
387+
<_AdditionalOptions Include="%(Compile.AdditionalCompileOptions)" />
388388
<_Args Include="@(_AdditionalOptions)" />
389389

390390
<_Args Include="$(_SourcePath)" />
@@ -431,7 +431,6 @@
431431
<_Args Include="-Wl,/subsystem:$(Subsystem)" Condition=" '$(Subsystem)' != '' " />
432432

433433
<_SystemRootDirectories Remove="@(_SystemRootDirectories)" />
434-
<_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" />
435434
<_SystemRootDirectories Include="@(SystemRootDirectories)" />
436435
<_SystemRootDirectories Include="$(SystemRootDirectories)" />
437436
<_SystemRootDirectoriesTemp Remove="@(_SystemRootDirectoriesTemp)" />
@@ -441,7 +440,6 @@
441440
<_Args Include="@(_SystemRootDirectoriesArgs)" />
442441

443442
<_IncludeSystemRootDirectories Remove="@(_IncludeSystemRootDirectories)" />
444-
<_IncludeSystemRootDirectories Include="%(Compile.IncludeSystemRootDirectories)" />
445443
<_IncludeSystemRootDirectories Include="@(IncludeSystemRootDirectories)" />
446444
<_IncludeSystemRootDirectories Include="$(IncludeSystemRootDirectories)" />
447445
<_IncludeSystemRootDirectoriesTemp Remove="@(_IncludeSystemRootDirectoriesTemp)" />

0 commit comments

Comments
 (0)