From 67470d439c2428125154a002738170957c688961 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Tue, 28 Jun 2016 12:51:05 -0400 Subject: [PATCH] [mtouch] Quote the .dylib used for incremental builds. Fixes #42006 (#303) Fix MT3001 AOT errors due to incorrect paths. https://bugzilla.xamarin.com/show_bug.cgi?id=42006 --- tools/mtouch/Application.cs | 2 +- tools/mtouch/Assembly.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mtouch/Application.cs b/tools/mtouch/Application.cs index 552b4e4b8e..9a5aab982e 100644 --- a/tools/mtouch/Application.cs +++ b/tools/mtouch/Application.cs @@ -1900,7 +1900,7 @@ namespace Xamarin.Bundler { if (!App.EnableMarkerOnlyBitCode) flags.AddOtherFlag ("-read_only_relocs suppress"); flags.LinkWithMono (); - flags.AddOtherFlag ($"-install_name @executable_path/{install_name}"); + flags.AddOtherFlag ("-install_name " + Driver.Quote ($"@executable_path/{install_name}")); flags.AddOtherFlag ("-fapplication-extension"); // fixes this: warning MT5203: Native linking warning: warning: linking against dylib not safe for use in application extensions: [..]/actionextension.dll.arm64.dylib } diff --git a/tools/mtouch/Assembly.cs b/tools/mtouch/Assembly.cs index fec9b1f614..2fb58ae704 100644 --- a/tools/mtouch/Assembly.cs +++ b/tools/mtouch/Assembly.cs @@ -377,7 +377,7 @@ namespace Xamarin.Bundler { var assembly = Path.Combine (build_dir, FileName); if (App.FastDev) - Dylib = Path.Combine (App.AppDirectory, "lib" + Path.GetFileName (FullPath) + ".dylib"); + Dylib = Path.Combine (App.AppDirectory, Driver.Quote ("lib" + Path.GetFileName (FullPath) + ".dylib")); foreach (var abi in abis) { var task = CreateManagedToAssemblyTasks (assembly, abi, build_dir);