|
48 | 48 | UseAotDataFile="false"
|
49 | 49 | AotModulesTablePath="$(WasmBuildDir)driver-gen.c"
|
50 | 50 | UseLLVM="true"
|
51 |
| - DisableParallelAot="true" |
| 51 | + DisableParallelAot="true" |
52 | 52 | LLVMPath="$(EMSDK_PATH)\upstream\bin">
|
53 | 53 | <Output TaskParameter="CompiledAssemblies" ItemName="_WasmAssemblies" />
|
54 | 54 | </MonoAOTCompiler>
|
|
104 | 104 | <ItemGroup>
|
105 | 105 | <_managedAppAssemblies Include="$(WasmAppDir)managed\*.dll"/>
|
106 | 106 | </ItemGroup>
|
107 |
| - <Exec Condition="'$(RunAOTCompilation)' == 'true'" Command="mono-cil-strip %(_managedAppAssemblies.Identity)" /> |
| 107 | + <!-- '$(ArchiveTests)' != 'true' is to skip on CI for now --> |
| 108 | + <Exec Condition="'$(RunAOTCompilation)' == 'true' and '$(ArchiveTests)' != 'true'" Command="mono-cil-strip %(_managedAppAssemblies.Identity)" /> |
108 | 109 | </Target>
|
109 | 110 |
|
110 | 111 | <Target Name="_WasmBuildNative" DependsOnTargets="_WasmAotCompileApp" Condition="'$(WasmBuildNative)' == 'true'">
|
|
120 | 121 | <PropertyGroup>
|
121 | 122 | <EmccFlags>$(EmccFlags) -s DISABLE_EXCEPTION_CATCHING=0</EmccFlags>
|
122 | 123 | <EmccFlags Condition="'$(RunAOTCompilation)' == 'true'">$(EmccFlags) -DENABLE_AOT=1 -DDRIVER_GEN=1</EmccFlags>
|
| 124 | + <_EmsdkEnvSourceCommand>source $(EMSDK_PATH)/emsdk_env.sh</_EmsdkEnvSourceCommand> |
| 125 | + <_EmccCommand>$(_EmsdkEnvSourceCommand) && emcc</_EmccCommand> |
123 | 126 | </PropertyGroup>
|
124 | 127 |
|
125 | 128 | <ReadLinesFromFile File="$(RuntimeEmccVersionFile)">
|
126 | 129 | <Output TaskParameter="Lines" PropertyName="RuntimeEmccVersion" />
|
127 | 130 | </ReadLinesFromFile>
|
128 | 131 |
|
129 |
| - <Exec Command="source $(EMSDK_PATH)/emsdk_env.sh && emcc --version | head -1 > emcc-version.txt" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" /> |
| 132 | + <Exec Command="bash -c '$(_EmccCommand) --version | head -1 > emcc-version.txt'" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" /> |
130 | 133 | <ReadLinesFromFile File="$(EmccPublishVersionFile)">
|
131 | 134 | <Output TaskParameter="Lines" PropertyName="EmccVersion" />
|
132 | 135 | </ReadLinesFromFile>
|
|
166 | 169 | <PropertyGroup>
|
167 | 170 | <_WasmIncludeDir>$(MicrosoftNetCoreAppRuntimePackRidDir)native/include</_WasmIncludeDir>
|
168 | 171 | <_WasmSrcDir>$(MicrosoftNetCoreAppRuntimePackRidDir)native/src</_WasmSrcDir>
|
169 |
| - <_WasmEmcc>source $(EMSDK_PATH)/emsdk_env.sh && emcc</_WasmEmcc> |
170 | 172 | <EmccCFlags>$(EmccFlags) -DCORE_BINDINGS -DGEN_PINVOKE=1 -I$(WasmBuildDir) -I$(_WasmIncludeDir)/mono-2.0 -I$(_WasmIncludeDir)/wasm</EmccCFlags>
|
171 | 173 | <EmccLDFlags>$(EmccFlags) -s TOTAL_MEMORY=536870912</EmccLDFlags>
|
172 | 174 | </PropertyGroup>
|
173 | 175 |
|
174 |
| - <Exec Command="$(_WasmEmcc) $(EmccCFlags) $(_WasmSrcDir)/driver.c -c -o driver.o" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
175 |
| - <Exec Command="$(_WasmEmcc) $(EmccCFlags) $(_WasmSrcDir)/corebindings.c -c -o corebindings.o" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
176 |
| - <Exec Command="$(_WasmEmcc) $(EmccCFlags) $(_WasmSrcDir)/pinvoke.c -c -o pinvoke.o" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
177 |
| - <Exec Command="$(_WasmEmcc) $(EmccLDFlags) --js-library $(_WasmSrcDir)/library_mono.js --js-library $(_WasmSrcDir)/binding_support.js --js-library $(_WasmSrcDir)/dotnet_support.js --js-library $(_WasmSrcDir)/pal_random.js @(_WasmAssemblies->'%(LlvmBitcodeFile)', ' ') @(_WasmObjects, ' ') -o dotnet.js" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
178 |
| - <Exec Condition="'$(WasmNativeStrip)' == 'true'" Command="$(EMSDK_PATH)/upstream/bin/wasm-opt --strip-dwarf dotnet.wasm -o dotnet.wasm" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" /> |
| 176 | + <Exec Command="bash -c '$(_EmccCommand) $(EmccCFlags) $(_WasmSrcDir)/driver.c -c -o driver.o'" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
| 177 | + <Exec Command="bash -c '$(_EmccCommand) $(EmccCFlags) $(_WasmSrcDir)/corebindings.c -c -o corebindings.o'" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
| 178 | + <Exec Command="bash -c '$(_EmccCommand) $(EmccCFlags) $(_WasmSrcDir)/pinvoke.c -c -o pinvoke.o'" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
| 179 | + <Exec Command="bash -c '$(_EmccCommand) $(EmccLDFlags) --js-library $(_WasmSrcDir)/library_mono.js --js-library $(_WasmSrcDir)/binding_support.js --js-library $(_WasmSrcDir)/dotnet_support.js --js-library $(_WasmSrcDir)/pal_random.js @(_WasmAssemblies->'%(LlvmBitcodeFile)', ' ') @(_WasmObjects, ' ') -o dotnet.js'" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" StandardOutputImportance="Low" /> |
| 180 | + <Exec Condition="'$(WasmNativeStrip)' == 'true'" Command="bash -c '$(EMSDK_PATH)/upstream/bin/wasm-opt --strip-dwarf dotnet.wasm -o dotnet.wasm'" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(WasmBuildDir)" /> |
179 | 181 | </Target>
|
180 | 182 |
|
181 | 183 | <Target Name="_GenerateRunV8Script">
|
|
0 commit comments