File tree Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Original file line number Diff line number Diff line change 190190 <_WasiClangCFlags Include =" " -I%(_WasmCommonIncludePaths.Identity)" " />
191191 <_WasiClangCFlags Include =" -I" $(MicrosoftNetCoreAppRuntimePackRidNativeDir.Replace('\', '/'))include" " />
192192
193+ <_WasiClangCFlags Include =" -g" Condition =" '$(WasmNativeDebugSymbols)' == 'true'" />
194+
193195 <_WasiClangCFlags Condition =" '@(WasiAfterRuntimeLoadedDeclarations)' != ''"
194196 Include =" -D WASI_AFTER_RUNTIME_LOADED_DECLARATIONS=" @(WasiAfterRuntimeLoadedDeclarations, ' ')" " />
195197 <_WasiClangCFlags Condition =" '@(WasiAfterRuntimeLoadedCalls)' != ''"
Original file line number Diff line number Diff line change 3131 <WasmEnableLegacyJsInterop Condition =" '$(WasmEnableLegacyJsInterop)' == ''" >true</WasmEnableLegacyJsInterop >
3232 <WasmEnableJsInteropByValue Condition =" '$(WasmEnableJsInteropByValue)' == '' and ( '$(WasmEnableThreads)' == 'true' or '$(MonoWasmBuildVariant)' == 'multithread' )" >true</WasmEnableJsInteropByValue >
3333 <WasmEnableJsInteropByValue Condition =" '$(WasmEnableJsInteropByValue)' == ''" >false</WasmEnableJsInteropByValue >
34- <WasmNativeDebugSymbols Condition =" '$(WasmNativeDebugSymbols)' == ''" >true</WasmNativeDebugSymbols >
3534
3635 <!-- Temporarily `false`, till sdk gets a fix for supporting the new file -->
3736 <WasmEmitSymbolMap Condition =" '$(WasmEmitSymbolMap)' == '' and '$(RunAOTCompilation)' != 'true'" >false</WasmEmitSymbolMap >
288287
289288 <_EmccCommonFlags Include =" $(_DefaultEmccFlags)" />
290289 <_EmccCommonFlags Include =" $(EmccFlags)" />
291- <_EmccCommonFlags Include =" -g" Condition =" '$(WasmNativeDebugSymbols )' == 'true '" />
290+ <_EmccCommonFlags Include =" -g" Condition =" '$(WasmNativeStrip )' == 'false '" />
292291 <_EmccCommonFlags Include =" -v" Condition =" '$(EmccVerbose)' != 'false'" />
293292 <_EmccCommonFlags Include =" -s DISABLE_EXCEPTION_CATCHING=0" Condition =" '$(WasmEnableExceptionHandling)' == 'false'" />
294293 <_EmccCommonFlags Include =" -fwasm-exceptions" Condition =" '$(WasmEnableExceptionHandling)' == 'true'" />
317316 <_EmccCFlags Include =" -emit-llvm" />
318317
319318 <_EmccCFlags Include =" " -I%(_EmccIncludePaths.Identity)" " />
319+ <_EmccCFlags Include =" -g" Condition =" '$(WasmNativeDebugSymbols)' == 'true'" />
320320
321321 <!-- Adding optimization flag at the top, so it gets precedence -->
322322 <_EmccLDFlags Include =" $(WasmLinkOptimizationFlag)" />
Original file line number Diff line number Diff line change 117117 $(PrepareInputsForWasmBuildDependsOn);
118118 _SetupToolchain;
119119 _SetWasmBuildNativeDefaults;
120- _SetWasmNativeStripDefault;
121120 _GetDefaultWasmAssembliesToBundle;
122121 _WasmGetRuntimeConfigPath;
123122 _ReadWasmProps;
516515
517516 <WasmBuildNative Condition =" '$(WasmBuildNative)' == '' and @(NativeFileReference->Count()) > 0" >true</WasmBuildNative >
518517 <WasmBuildNative Condition =" '$(WasmBuildNative)' == '' and '$(WasmSingleFileBundle)' == 'true'" >true</WasmBuildNative >
519- <WasmBuildNative Condition =" '$(WasmBuildNative)' == ''" >false</WasmBuildNative >
520518 </PropertyGroup >
521519
522520 <!-- When Publishing -->
531529
532530 <!-- default to relinking in Release config -->
533531 <WasmBuildNative Condition =" '$(WasmBuildNative)' == '' and '$(Configuration)' == 'Release'" >true</WasmBuildNative >
532+ </PropertyGroup >
534533
534+ <PropertyGroup >
535535 <WasmBuildNative Condition =" '$(WasmBuildNative)' == ''" >false</WasmBuildNative >
536536 </PropertyGroup >
537- </Target >
538537
539- <Target Name =" _SetWasmNativeStripDefault" Condition =" '$(WasmNativeStrip)' == ''" >
538+ <!-- Default with nothing set: Build+relink+config=debug -->
539+ <PropertyGroup Condition =" '$(WasmNativeDebugSymbols)' == '' and '$(WasmNativeStrip)' == '' and '$(WasmBuildingForNestedPublish)' != 'true' and '$(WasmBuildNative)' == 'true' and '$(Configuration)' == 'Debug'" >
540+ <WasmNativeDebugSymbols >true</WasmNativeDebugSymbols >
541+ <WasmNativeStrip >false</WasmNativeStrip >
542+ </PropertyGroup >
543+
540544 <PropertyGroup >
541- <!-- Build+relink+config=debug -->
542- <WasmNativeStrip Condition =" '$(WasmBuildingForNestedPublish)' != 'true' and '$(WasmBuildNative)' == 'true' and '$(Configuration)' == 'Debug'" >false</WasmNativeStrip >
545+ <WasmNativeDebugSymbols Condition =" '$(WasmNativeDebugSymbols)' == ''" >true</WasmNativeDebugSymbols >
543546 <WasmNativeStrip Condition =" '$(WasmNativeStrip)' == ''" >true</WasmNativeStrip >
544547 </PropertyGroup >
545548 </Target >
You can’t perform that action at this time.
0 commit comments