From 2ed4a98a5c646c33720048b4c9074dc0809821ef Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Wed, 4 May 2016 10:43:03 -0400 Subject: [PATCH] [mono-runtimes] Encode $(HostOS) into `host` build path. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using build-tools/mono-runtimes/obj/$(Configuration)/host as the mono build path for the "host" OS is problematic when the source tree is shared amongst multiple different operating systems, e.g. if the `xamarin-android` checkout is in Dropbox, and the "same" Dropbox folder is shared between OS X and Linux. There Can Be Only One™ host OS, as it were. (This is presumably fine for non-host builds, as cross compoilers are used, and the cross compilers should presumably compatible object code across operating systems...) Improve support for cross-OS source tree sharing, and encode `$(HostOS)` into the build path, resulting in build-tools/mono-runtimes/obj/$(Configuration)/host-$(HostOS). This would allow OS X and Linux to share source trees without stepping on each others toes. (Not currently encoded: OS architecture. There Can Be Only One™ "Linux" build tree with this setup...) --- build-tools/mono-runtimes/mono-runtimes.projitems | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.projitems b/build-tools/mono-runtimes/mono-runtimes.projitems index d54b58570c8..05ffc524ad2 100644 --- a/build-tools/mono-runtimes/mono-runtimes.projitems +++ b/build-tools/mono-runtimes/mono-runtimes.projitems @@ -19,7 +19,7 @@ libmono-profiler-log.so libMonoPosixHelper.so - <_MonoRuntime Include="host" Condition="'$(HostOS)'=='Darwin'"> + <_MonoRuntime Include="host-Darwin" Condition=" '$(HostOS)' == 'Darwin' "> ar as $(HostCc) @@ -36,11 +36,11 @@ libmono-profiler-log.dylib libMonoPosixHelper.dylib - <_MonoRuntime Include="host" Condition="'$(HostOS)'=='Linux'"> + <_MonoRuntime Include="host-Linux" Condition=" '$(HostOS)' == 'Linux' "> ar as $(HostCc) - $(_CommonCFlags) -mmacosx-version-min=10.9 + $(_CommonCFlags) $(HostCxx) cpp