From 3c11bb51852a1dc4788c590b3d03b991e81ca7d1 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Tue, 28 Apr 2015 14:33:14 -0700 Subject: [PATCH] Remove Mac build workaround Remove the workaround for the issue in XCode 6.3 where __debug was being included by some system headers but was not present. We were adding our own include directory with a dummy '__debug' file. The issue has been fixed by Apple in 6.3.1 so we no longer need this workaround. --- src/coreclr/hosts/unixcorerun/CMakeLists.txt | 7 ------- src/coreclr/hosts/unixcorerun/inc/__debug | 16 ---------------- 2 files changed, 23 deletions(-) delete mode 100644 src/coreclr/hosts/unixcorerun/inc/__debug diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt index e82f0e2..fd9de1c 100644 --- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt @@ -1,12 +1,5 @@ project(unixcorerun) -# Work around XCode 6.3 SDK issue where __debug is included by some -# system headers but not present by adding our own include directory -# with a dummy file called __debug. -if(APPLE) - include_directories(inc) -endif(APPLE) - set(CORERUN_SOURCES corerun.cpp ) diff --git a/src/coreclr/hosts/unixcorerun/inc/__debug b/src/coreclr/hosts/unixcorerun/inc/__debug deleted file mode 100644 index 446304d..0000000 --- a/src/coreclr/hosts/unixcorerun/inc/__debug +++ /dev/null @@ -1,16 +0,0 @@ -// -// Copyright (c) Microsoft. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// - -// This file exists in order to work around an issue with the XCode 6.3 SDK. -// Some of the system headers that unixcorerun references try to include a -// __debug header which does not exist. This provides a dummy implementation -// of that header so we don't get build errors. - -// This will be removed once an updated SDK is available. - -#ifndef _LIBCPP_ASSERT -#define _LIBCPP_ASSERT(x, m) ((void)0) -#endif - -- 2.7.4