Skip to content
This repository was archived by the owner on Oct 15, 2020. It is now read-only.

Commit 32f5986

Browse files
committed
[Merge chakra-core/ChakraCore@c36f7bf022] Ignore VS2017 linker warning LNK4221
1 parent 1088653 commit 32f5986

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

deps/chakrashim/core/Build/Common.Build.props

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!--Disable midl timestamps wherever possible, razzle build already have this-->
1818
<AdditionalOptions Condition="'$(BuildingWithBuildExe)'!='true'">%(AdditionalOptions) /no_stamp</AdditionalOptions>
19-
19+
2020
<SuppressStartupBanner>true</SuppressStartupBanner>
2121

2222
<!-- Other defaults -->
@@ -25,7 +25,7 @@
2525

2626
<!-- ======== makefiledef ======== -->
2727
<AdditionalOptions>%(AdditionalOptions) -sal</AdditionalOptions>
28-
28+
2929
<!-- ======== sources.inc ======== -->
3030
<!-- generates SAL annotations for our interface -->
3131
<AdditionalOptions>%(AdditionalOptions) -sal_local</AdditionalOptions>
@@ -40,10 +40,10 @@
4040

4141
<!-- Add any preprocessor definitions passed using msbuild environment -->
4242
<PreprocessorDefinitions Condition="'$(AdditionalPreprocessorDefinitions)'!=''">%(PreprocessorDefinitions);$(AdditionalPreprocessorDefinitions)</PreprocessorDefinitions>
43-
43+
4444
<!-- MIDL generate code uses this define -->
4545
<PreprocessorDefinitions Condition="'$(Platform)'=='ARM'">%(PreprocessorDefinitions);_ARM_</PreprocessorDefinitions>
46-
46+
4747
<!-- /W4 -->
4848
<WarningLevel>Level4</WarningLevel>
4949
<!-- /WX -->
@@ -102,7 +102,13 @@
102102

103103
<!-- Always set the checksum -->
104104
<AdditionalOptions>%(AdditionalOptions) /release</AdditionalOptions>
105+
<!-- Ignore Linker warning: This object file does not define any previously undefined public symbols -->
106+
<AdditionalOptions>%(AdditionalOptions) /ignore:4221</AdditionalOptions>
105107
</Link>
108+
<Lib>
109+
<!-- Ignore Linker warning: This object file does not define any previously undefined public symbols -->
110+
<AdditionalOptions>%(AdditionalOptions) /ignore:4221</AdditionalOptions>
111+
</Lib>
106112
</ItemDefinitionGroup>
107113
<!-- chk build flags -->
108114
<ItemDefinitionGroup Condition="'$(OptimizedBuild)'!='true'">

0 commit comments

Comments
 (0)