From 3ecefe787b77a0f9f793f66e7fa712cee4af62c9 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Wed, 3 Apr 2024 18:37:54 -0500 Subject: [PATCH] Fix _Language. Wasn't considering non C/C++. --- src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets index 8654872..067cecd 100644 --- a/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets +++ b/src/IKVM.Clang.Sdk/Sdk/targets/IKVM.Clang.Core.targets @@ -400,8 +400,8 @@ <_DebugSymbols Condition=" '$(_DebugSymbols)' == '' ">$(DebugSymbols) <_Language>%(Compile.Language) <_Language Condition=" '$(_Language)' == '' ">$(Language) - <_Language Condition=" '$(_Language)' == '' And '%(Compile.Extension)' == '.c' ">C - <_Language Condition=" '$(_Language)' == '' And '%(Compile.Extension)' == '.cpp' ">C++ + <_Language Condition=" '$(_Language)' == '' And '%(Compile.Extension)' == '.c' ">c + <_Language Condition=" '$(_Language)' == '' And '%(Compile.Extension)' == '.cpp' ">c++ <_Language Condition=" '$(_Language)' == '' And '%(Compile.Extension)' == '.m' ">objective-c <_Language Condition=" '$(_Language)' == '' And '%(Compile.Extension)' == '.mm' ">objective-c++ <_LanguageStandard>%(Compile.LanguageStandard) @@ -426,8 +426,7 @@ <_Args Include="-fms-compatibility" Condition=" '$(_MsCompatibility)' == 'true' " /> <_Args Include="-fms-compatibility-version" Value="$(_MsCompatibilityVersion)" Separator="=" Condition=" '$(_MsCompatibilityVersion)' != '' " /> - <_Args Include="-xc" Condition=" '$(_Language)' == 'C' " /> - <_Args Include="-xc++" Condition=" '$(_Language)' == 'C++' " /> + <_Args Include="-x $(_Language)" Condition=" '$(_Language)' != '' " /> <_SystemRootDirectories Remove="@(_SystemRootDirectories)" /> <_SystemRootDirectories Include="%(Compile.SystemRootDirectories)" />