Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/coreclr/runtime.proj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<_BuildNativeTargetOS Condition="'$(TargetsLinuxBionic)' == 'true'">linux-bionic</_BuildNativeTargetOS>
<HasCdacBuildTool Condition="'$(ClrFullNativeBuild)' == 'true' or '$(ClrRuntimeSubset)' == 'true' or '$(ClrDebugSubset)' == 'true' or '$(ClrCrossComponentsSubset)' == 'true' or '$(ClrNativeAotSubset)' == 'true'">true</HasCdacBuildTool>
<BuildRuntimeDependsOnTargets>GetPgoDataPackagePath</BuildRuntimeDependsOnTargets>
<BuildRuntimeDependsOnTargets Condition="'$(EnableSourceControlManagerQueries)' == 'true'">$(BuildRuntimeDependsOnTargets);InitializeSourceControlInformationFromSourceControlManager</BuildRuntimeDependsOnTargets>
<BuildRuntimeDependsOnTargets Condition="'$(TargetsBrowser)' == 'true'">AcquireEmscriptenSdk;$(BuildRuntimeDependsOnTargets);GenerateEmccExports</BuildRuntimeDependsOnTargets>
<BuildRuntimeDependsOnTargets Condition="'$(TargetsWasi)' == 'true'">AcquireWasiSdk;$(BuildRuntimeDependsOnTargets)</BuildRuntimeDependsOnTargets>
</PropertyGroup>
Expand Down Expand Up @@ -57,6 +58,7 @@
<_CoreClrBuildArg Condition="'$(FeatureXplatEventSource)' == 'false'" Include="-cmakeargs &quot;-DFEATURE_EVENTSOURCE_XPLAT=0&quot;" />
<_CoreClrBuildArg Condition="'$(FeatureInterpreter)' == 'true'" Include="-cmakeargs &quot;-DFEATURE_INTERPRETER=1&quot;" />
<_CoreClrBuildArg Condition="'$(FeatureDynamicCodeCompiled)' == 'true' or '$(FeatureDynamicCodeCompiled)' == ''" Include="-cmakeargs &quot;-DFEATURE_DYNAMIC_CODE_COMPILED=1&quot;" />
<_CoreClrBuildArg Include="-cmakeargs &quot;-DCLI_CMAKE_COMMIT_HASH=$([MSBuild]::ValueOrDefault('$(SourceRevisionId)', 'N/A'))&quot;" />
</ItemGroup>

<ItemGroup Condition="'$(CxxStandardLibrary)' != ''">
Expand Down
9 changes: 0 additions & 9 deletions src/native/corehost/configure.h.in
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
#ifndef PAL_HOST_CONFIGURE_H_INCLUDED
#define PAL_HOST_CONFIGURE_H_INCLUDED

#cmakedefine CLR_SINGLE_FILE_HOST_ONLY

#ifdef CLR_SINGLE_FILE_HOST_ONLY
// When hosting components are all statically linked,
// the versioning information is irrelevant and may only come up in tracing.
// so we will use "static"
#define REPO_COMMIT_HASH "static"
#else
#define REPO_COMMIT_HASH "@CLI_CMAKE_COMMIT_HASH@"
#endif

#define FALLBACK_HOST_OS "@CLI_CMAKE_FALLBACK_OS@"
#define CURRENT_OS_NAME "@CLR_CMAKE_TARGET_OS@"
Expand Down
Loading