Skip to content

Commit b7de30c

Browse files
committed
wip
1 parent 259a8a4 commit b7de30c

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/mono/wasm/build/WasmApp.Native.targets

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
$(_BeforeWasmBuildAppDependsOn);
2323
_SetupEmscripten;
2424
_SetWasmBuildNativeDefaults;
25-
_SetWasmNativeStripDefault;
25+
_SetDebugSymbolsPropertiesDefaults;
2626
_ReadEmccProps
2727
</_BeforeWasmBuildAppDependsOn>
2828

@@ -119,6 +119,7 @@
119119
<_BoolPropertiesThatTriggerRelinking Include="InvariantTimezone" DefaultValueInRuntimePack="false" />
120120
<_BoolPropertiesThatTriggerRelinking Include="InvariantGlobalization" DefaultValueInRuntimePack="false" />
121121
<_BoolPropertiesThatTriggerRelinking Include="WasmNativeStrip" DefaultValueInRuntimePack="true" />
122+
<_BoolPropertiesThatTriggerRelinking Include="WasmNativeDebugSymbols" DefaultValueInRuntimePack="false" />
122123
</ItemGroup>
123124

124125
<PropertyGroup>
@@ -160,10 +161,19 @@
160161
</PropertyGroup>
161162
</Target>
162163

163-
<Target Name="_SetWasmNativeStripDefault" Condition="'$(WasmNativeStrip)' == ''">
164-
<PropertyGroup>
164+
<Target Name="_SetDebugSymbolsPropertiesDefaults">
165+
<!-- Default with nothing set -->
166+
<PropertyGroup Condition="'$(WasmNativeDebugSymbols)' == '' and '$(WasmNativeStrip)' == ''">
165167
<!-- Build+relink+config=debug -->
166-
<WasmNativeStrip Condition="'$(WasmBuildingForNestedPublish)' != 'true' and '$(WasmBuildNative)' == 'true' and '$(Configuration)' == 'Debug'">false</WasmNativeStrip>
168+
<WasmNativeDebugSymbols Condition="'$(WasmBuildingForNestedPublish)' != 'true' and '$(WasmBuildNative)' == 'true' and '$(Configuration)' == 'Debug'">true</WasmNativeDebugSymbols>
169+
170+
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'true'">false</WasmNativeStrip>
171+
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'false'">true</WasmNativeStrip>
172+
</PropertyGroup>
173+
174+
<PropertyGroup>
175+
<!-- the two properties do not influence each other -->
176+
<WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">false</WasmNativeDebugSymbols>
167177
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == ''">true</WasmNativeStrip>
168178
</PropertyGroup>
169179
</Target>
@@ -178,7 +188,6 @@
178188
<_MonoAotCrossCompilerPath>@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier','browser-wasm'))</_MonoAotCrossCompilerPath>
179189
<_EmccDefaultFlagsRsp>$([MSBuild]::NormalizePath($(_WasmRuntimePackSrcDir), 'emcc-default.rsp'))</_EmccDefaultFlagsRsp>
180190
<_EmccDefaultLinkFlagsRsp>$([MSBuild]::NormalizePath($(_WasmRuntimePackSrcDir), 'emcc-link.rsp'))</_EmccDefaultLinkFlagsRsp>
181-
<WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">true</WasmNativeDebugSymbols>
182191
<WasmLinkIcalls Condition="'$(WasmLinkIcalls)' == ''">$(WasmBuildNative)</WasmLinkIcalls>
183192

184193
<_WasmICallTablePath>$(_WasmIntermediateOutputPath)icall-table.h</_WasmICallTablePath>

0 commit comments

Comments
 (0)