Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[wasm] Fix AOT for projects with space in path/name #92880

Closed
wants to merge 4 commits into from
Closed

[wasm] Fix AOT for projects with space in path/name #92880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c21d70f
Fix building with AOT project with space in path/name
maraf Oct 2, 2023
383108b
Add space to WBT projects
maraf Oct 2, 2023
af0775e
Quotes for V8 script
maraf Oct 2, 2023
09a3038
Update src/tasks/AotCompilerTask/MonoAOTCompiler.cs
maraf Oct 2, 2023
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: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class BuildEnvironment
public static readonly string RelativeTestAssetsPath = @"..\testassets\";
public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");
public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt artifacts");

public static readonly string DefaultRuntimeIdentifier =
#if TARGET_WASI
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/build/WasmApp.Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@
Condition="'$(EmccInitialHeapSize)' == ''"
DependsOnTargets="_CheckEmccIsExpectedVersion">
<ItemGroup>
<_AOTObjectFile Include="%(_BitcodeFile.ObjectFile)" />
<_AOTObjectFile Include="&quot;%(_BitcodeFile.ObjectFile)&quot;" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add the quotes where this is being used instead of here.

</ItemGroup>

<!-- for AOT builds we use llvm-size tool to collect size of the DATA segment in each object file -->
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/build/WasmApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@
<FileWrites Include="$(WasmRunV8ScriptPath)" />
</ItemGroup>

<Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod a+x $(WasmRunV8ScriptPath)" />
<Exec Condition="'$(OS)' != 'Windows_NT'" Command="chmod a+x '$(WasmRunV8ScriptPath)'" />
</Target>

<Target Name="_WasmResolveReferences" Condition="'$(WasmResolveAssembliesBeforeBuild)' == 'true'">
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/AotCompilerTask/MonoAOTCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ private PrecompileArguments GetPrecompileArgumentsFor(ITaskItem assemblyItem, st
if (isDedup)
{
foreach (var aItem in _assembliesToCompile!)
processArgs.Add(aItem.ItemSpec);
processArgs.Add($"""{aItem.ItemSpec}""");
}
else
{
Expand Down
Loading