diff --git a/ci/azure/macos_arm64_script b/ci/azure/macos_arm64_script
index 167276aaab..336de1db48 100755
--- a/ci/azure/macos_arm64_script
+++ b/ci/azure/macos_arm64_script
@@ -8,15 +8,15 @@ brew update && brew install ncurses s3cmd
 ZIGDIR="$(pwd)"
 
 HOST_ARCH="x86_64"
-HOST_TARGET="$HOST_ARCH-macos-gnu"
+HOST_TARGET="$HOST_ARCH-macos-none"
 HOST_MCPU="baseline"
-HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.9.1"
+HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.10.0-dev.2348+d43761808"
 HOST_PREFIX="$HOME/$HOST_CACHE_BASENAME"
 
 ARCH="aarch64"
-TARGET="$ARCH-macos-gnu"
+TARGET="$ARCH-macos-none"
 MCPU="apple_a14"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.1"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2348+d43761808"
 PREFIX="$HOME/$CACHE_BASENAME"
 
 JOBS="-j2"
diff --git a/ci/azure/macos_script b/ci/azure/macos_script
index 28a53b4501..9e32e7803e 100755
--- a/ci/azure/macos_script
+++ b/ci/azure/macos_script
@@ -7,9 +7,9 @@ brew update && brew install ncurses s3cmd
 
 ZIGDIR="$(pwd)"
 ARCH="x86_64"
-TARGET="$ARCH-macos-gnu"
+TARGET="$ARCH-macos-none"
 MCPU="baseline"
-CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.9.1"
+CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.10.0-dev.2348+d43761808"
 PREFIX="$HOME/$CACHE_BASENAME"
 JOBS="-j2"
 
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/_limits.h b/lib/libc/include/aarch64-macos.11-none/arm/_limits.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/_limits.h
rename to lib/libc/include/aarch64-macos.11-none/arm/_limits.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/_mcontext.h b/lib/libc/include/aarch64-macos.11-none/arm/_mcontext.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/_mcontext.h
rename to lib/libc/include/aarch64-macos.11-none/arm/_mcontext.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/_param.h b/lib/libc/include/aarch64-macos.11-none/arm/_param.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/_param.h
rename to lib/libc/include/aarch64-macos.11-none/arm/_param.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/_types.h b/lib/libc/include/aarch64-macos.11-none/arm/_types.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/_types.h
rename to lib/libc/include/aarch64-macos.11-none/arm/_types.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/arch.h b/lib/libc/include/aarch64-macos.11-none/arm/arch.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/arch.h
rename to lib/libc/include/aarch64-macos.11-none/arm/arch.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/endian.h b/lib/libc/include/aarch64-macos.11-none/arm/endian.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/endian.h
rename to lib/libc/include/aarch64-macos.11-none/arm/endian.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/limits.h b/lib/libc/include/aarch64-macos.11-none/arm/limits.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/limits.h
rename to lib/libc/include/aarch64-macos.11-none/arm/limits.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/param.h b/lib/libc/include/aarch64-macos.11-none/arm/param.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/param.h
rename to lib/libc/include/aarch64-macos.11-none/arm/param.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/signal.h b/lib/libc/include/aarch64-macos.11-none/arm/signal.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/signal.h
rename to lib/libc/include/aarch64-macos.11-none/arm/signal.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/arm/types.h b/lib/libc/include/aarch64-macos.11-none/arm/types.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/arm/types.h
rename to lib/libc/include/aarch64-macos.11-none/arm/types.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/libkern/OSAtomic.h b/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomic.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/libkern/OSAtomic.h
rename to lib/libc/include/aarch64-macos.11-none/libkern/OSAtomic.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/libkern/OSAtomicDeprecated.h b/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicDeprecated.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/libkern/OSAtomicDeprecated.h
rename to lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicDeprecated.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/libkern/OSAtomicQueue.h b/lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicQueue.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/libkern/OSAtomicQueue.h
rename to lib/libc/include/aarch64-macos.11-none/libkern/OSAtomicQueue.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/libkern/OSSpinLockDeprecated.h b/lib/libc/include/aarch64-macos.11-none/libkern/OSSpinLockDeprecated.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/libkern/OSSpinLockDeprecated.h
rename to lib/libc/include/aarch64-macos.11-none/libkern/OSSpinLockDeprecated.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/libkern/arm/OSByteOrder.h b/lib/libc/include/aarch64-macos.11-none/libkern/arm/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/libkern/arm/OSByteOrder.h
rename to lib/libc/include/aarch64-macos.11-none/libkern/arm/OSByteOrder.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/_structs.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/_structs.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/_structs.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/_structs.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/boolean.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/boolean.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/boolean.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/boolean.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/exception.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/exception.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/exception.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/exception.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/kern_return.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/kern_return.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/kern_return.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/kern_return.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/processor_info.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/processor_info.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/processor_info.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/processor_info.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/rpc.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/rpc.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/rpc.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/rpc.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/thread_state.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/thread_state.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/thread_state.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/thread_state.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/thread_status.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/thread_status.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/thread_status.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/thread_status.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/vm_param.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/vm_param.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/vm_param.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/vm_param.h
diff --git a/lib/libc/include/aarch64-macos.11-gnu/mach/arm/vm_types.h b/lib/libc/include/aarch64-macos.11-none/mach/arm/vm_types.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.11-gnu/mach/arm/vm_types.h
rename to lib/libc/include/aarch64-macos.11-none/mach/arm/vm_types.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/_limits.h b/lib/libc/include/aarch64-macos.12-none/arm/_limits.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/_limits.h
rename to lib/libc/include/aarch64-macos.12-none/arm/_limits.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/_mcontext.h b/lib/libc/include/aarch64-macos.12-none/arm/_mcontext.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/_mcontext.h
rename to lib/libc/include/aarch64-macos.12-none/arm/_mcontext.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/_param.h b/lib/libc/include/aarch64-macos.12-none/arm/_param.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/_param.h
rename to lib/libc/include/aarch64-macos.12-none/arm/_param.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/_types.h b/lib/libc/include/aarch64-macos.12-none/arm/_types.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/_types.h
rename to lib/libc/include/aarch64-macos.12-none/arm/_types.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/arch.h b/lib/libc/include/aarch64-macos.12-none/arm/arch.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/arch.h
rename to lib/libc/include/aarch64-macos.12-none/arm/arch.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/endian.h b/lib/libc/include/aarch64-macos.12-none/arm/endian.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/endian.h
rename to lib/libc/include/aarch64-macos.12-none/arm/endian.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/limits.h b/lib/libc/include/aarch64-macos.12-none/arm/limits.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/limits.h
rename to lib/libc/include/aarch64-macos.12-none/arm/limits.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/param.h b/lib/libc/include/aarch64-macos.12-none/arm/param.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/param.h
rename to lib/libc/include/aarch64-macos.12-none/arm/param.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/signal.h b/lib/libc/include/aarch64-macos.12-none/arm/signal.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/signal.h
rename to lib/libc/include/aarch64-macos.12-none/arm/signal.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/arm/types.h b/lib/libc/include/aarch64-macos.12-none/arm/types.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/arm/types.h
rename to lib/libc/include/aarch64-macos.12-none/arm/types.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/libkern/OSAtomic.h b/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomic.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/libkern/OSAtomic.h
rename to lib/libc/include/aarch64-macos.12-none/libkern/OSAtomic.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/libkern/OSAtomicDeprecated.h b/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicDeprecated.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/libkern/OSAtomicDeprecated.h
rename to lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicDeprecated.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/libkern/OSAtomicQueue.h b/lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicQueue.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/libkern/OSAtomicQueue.h
rename to lib/libc/include/aarch64-macos.12-none/libkern/OSAtomicQueue.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/libkern/OSSpinLockDeprecated.h b/lib/libc/include/aarch64-macos.12-none/libkern/OSSpinLockDeprecated.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/libkern/OSSpinLockDeprecated.h
rename to lib/libc/include/aarch64-macos.12-none/libkern/OSSpinLockDeprecated.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/libkern/arm/OSByteOrder.h b/lib/libc/include/aarch64-macos.12-none/libkern/arm/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/libkern/arm/OSByteOrder.h
rename to lib/libc/include/aarch64-macos.12-none/libkern/arm/OSByteOrder.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/_structs.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/_structs.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/_structs.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/_structs.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/boolean.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/boolean.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/boolean.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/boolean.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/exception.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/exception.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/exception.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/exception.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/kern_return.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/kern_return.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/kern_return.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/kern_return.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/processor_info.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/processor_info.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/processor_info.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/processor_info.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/rpc.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/rpc.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/rpc.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/rpc.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/thread_state.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/thread_state.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/thread_state.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/thread_state.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/thread_status.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/thread_status.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/thread_status.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/thread_status.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/vm_param.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/vm_param.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/vm_param.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/vm_param.h
diff --git a/lib/libc/include/aarch64-macos.12-gnu/mach/arm/vm_types.h b/lib/libc/include/aarch64-macos.12-none/mach/arm/vm_types.h
similarity index 100%
rename from lib/libc/include/aarch64-macos.12-gnu/mach/arm/vm_types.h
rename to lib/libc/include/aarch64-macos.12-none/mach/arm/vm_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/Availability.h b/lib/libc/include/x86_64-macos.10-none/Availability.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/Availability.h
rename to lib/libc/include/x86_64-macos.10-none/Availability.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/AvailabilityInternal.h b/lib/libc/include/x86_64-macos.10-none/AvailabilityInternal.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/AvailabilityInternal.h
rename to lib/libc/include/x86_64-macos.10-none/AvailabilityInternal.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/AvailabilityMacros.h b/lib/libc/include/x86_64-macos.10-none/AvailabilityMacros.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/AvailabilityMacros.h
rename to lib/libc/include/x86_64-macos.10-none/AvailabilityMacros.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/TargetConditionals.h b/lib/libc/include/x86_64-macos.10-none/TargetConditionals.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/TargetConditionals.h
rename to lib/libc/include/x86_64-macos.10-none/TargetConditionals.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/_ctermid.h b/lib/libc/include/x86_64-macos.10-none/_ctermid.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/_ctermid.h
rename to lib/libc/include/x86_64-macos.10-none/_ctermid.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/bsm/audit.h b/lib/libc/include/x86_64-macos.10-none/bsm/audit.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/bsm/audit.h
rename to lib/libc/include/x86_64-macos.10-none/bsm/audit.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/block.h b/lib/libc/include/x86_64-macos.10-none/dispatch/block.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/block.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/block.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/dispatch.h b/lib/libc/include/x86_64-macos.10-none/dispatch/dispatch.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/dispatch.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/dispatch.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/group.h b/lib/libc/include/x86_64-macos.10-none/dispatch/group.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/group.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/group.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/object.h b/lib/libc/include/x86_64-macos.10-none/dispatch/object.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/object.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/object.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/queue.h b/lib/libc/include/x86_64-macos.10-none/dispatch/queue.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/queue.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/queue.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/semaphore.h b/lib/libc/include/x86_64-macos.10-none/dispatch/semaphore.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/semaphore.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/semaphore.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/source.h b/lib/libc/include/x86_64-macos.10-none/dispatch/source.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/source.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/source.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/dispatch/workloop.h b/lib/libc/include/x86_64-macos.10-none/dispatch/workloop.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/dispatch/workloop.h
rename to lib/libc/include/x86_64-macos.10-none/dispatch/workloop.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/_limits.h b/lib/libc/include/x86_64-macos.10-none/i386/_limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/_limits.h
rename to lib/libc/include/x86_64-macos.10-none/i386/_limits.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/_mcontext.h b/lib/libc/include/x86_64-macos.10-none/i386/_mcontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/_mcontext.h
rename to lib/libc/include/x86_64-macos.10-none/i386/_mcontext.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/_param.h b/lib/libc/include/x86_64-macos.10-none/i386/_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/_param.h
rename to lib/libc/include/x86_64-macos.10-none/i386/_param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/_types.h b/lib/libc/include/x86_64-macos.10-none/i386/_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/_types.h
rename to lib/libc/include/x86_64-macos.10-none/i386/_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/eflags.h b/lib/libc/include/x86_64-macos.10-none/i386/eflags.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/eflags.h
rename to lib/libc/include/x86_64-macos.10-none/i386/eflags.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/endian.h b/lib/libc/include/x86_64-macos.10-none/i386/endian.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/endian.h
rename to lib/libc/include/x86_64-macos.10-none/i386/endian.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/limits.h b/lib/libc/include/x86_64-macos.10-none/i386/limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/limits.h
rename to lib/libc/include/x86_64-macos.10-none/i386/limits.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/param.h b/lib/libc/include/x86_64-macos.10-none/i386/param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/param.h
rename to lib/libc/include/x86_64-macos.10-none/i386/param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/signal.h b/lib/libc/include/x86_64-macos.10-none/i386/signal.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/signal.h
rename to lib/libc/include/x86_64-macos.10-none/i386/signal.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/i386/types.h b/lib/libc/include/x86_64-macos.10-none/i386/types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/i386/types.h
rename to lib/libc/include/x86_64-macos.10-none/i386/types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/OSAtomic.h b/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomic.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/OSAtomic.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/OSAtomic.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/OSAtomicDeprecated.h b/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicDeprecated.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/OSAtomicDeprecated.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicDeprecated.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/OSAtomicQueue.h b/lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicQueue.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/OSAtomicQueue.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/OSAtomicQueue.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/OSByteOrder.h b/lib/libc/include/x86_64-macos.10-none/libkern/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/OSByteOrder.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/OSSpinLockDeprecated.h b/lib/libc/include/x86_64-macos.10-none/libkern/OSSpinLockDeprecated.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/OSSpinLockDeprecated.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/OSSpinLockDeprecated.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/_OSByteOrder.h b/lib/libc/include/x86_64-macos.10-none/libkern/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/_OSByteOrder.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/_OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/i386/OSByteOrder.h b/lib/libc/include/x86_64-macos.10-none/libkern/i386/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/i386/OSByteOrder.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/i386/OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libkern/i386/_OSByteOrder.h b/lib/libc/include/x86_64-macos.10-none/libkern/i386/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libkern/i386/_OSByteOrder.h
rename to lib/libc/include/x86_64-macos.10-none/libkern/i386/_OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/libproc.h b/lib/libc/include/x86_64-macos.10-none/libproc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/libproc.h
rename to lib/libc/include/x86_64-macos.10-none/libproc.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach-o/compact_unwind_encoding.h b/lib/libc/include/x86_64-macos.10-none/mach-o/compact_unwind_encoding.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach-o/compact_unwind_encoding.h
rename to lib/libc/include/x86_64-macos.10-none/mach-o/compact_unwind_encoding.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach-o/dyld.h b/lib/libc/include/x86_64-macos.10-none/mach-o/dyld.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach-o/dyld.h
rename to lib/libc/include/x86_64-macos.10-none/mach-o/dyld.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach-o/loader.h b/lib/libc/include/x86_64-macos.10-none/mach-o/loader.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach-o/loader.h
rename to lib/libc/include/x86_64-macos.10-none/mach-o/loader.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/exception_types.h b/lib/libc/include/x86_64-macos.10-none/mach/exception_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/exception_types.h
rename to lib/libc/include/x86_64-macos.10-none/mach/exception_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/host_special_ports.h b/lib/libc/include/x86_64-macos.10-none/mach/host_special_ports.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/host_special_ports.h
rename to lib/libc/include/x86_64-macos.10-none/mach/host_special_ports.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/_structs.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/_structs.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/_structs.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/_structs.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/boolean.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/boolean.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/boolean.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/boolean.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/exception.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/exception.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/exception.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/exception.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/fp_reg.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/fp_reg.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/fp_reg.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/fp_reg.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/kern_return.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/kern_return.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/kern_return.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/kern_return.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/processor_info.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/processor_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/processor_info.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/processor_info.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/rpc.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/rpc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/rpc.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/rpc.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/thread_state.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/thread_state.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/thread_state.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/thread_state.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/thread_status.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/thread_status.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/thread_status.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/thread_status.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/vm_param.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/vm_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/vm_param.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/vm_param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/i386/vm_types.h b/lib/libc/include/x86_64-macos.10-none/mach/i386/vm_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/i386/vm_types.h
rename to lib/libc/include/x86_64-macos.10-none/mach/i386/vm_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/kern_return.h b/lib/libc/include/x86_64-macos.10-none/mach/kern_return.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/kern_return.h
rename to lib/libc/include/x86_64-macos.10-none/mach/kern_return.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/mach_init.h b/lib/libc/include/x86_64-macos.10-none/mach/mach_init.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/mach_init.h
rename to lib/libc/include/x86_64-macos.10-none/mach/mach_init.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/mach_port.h b/lib/libc/include/x86_64-macos.10-none/mach/mach_port.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/mach_port.h
rename to lib/libc/include/x86_64-macos.10-none/mach/mach_port.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/mach_traps.h b/lib/libc/include/x86_64-macos.10-none/mach/mach_traps.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/mach_traps.h
rename to lib/libc/include/x86_64-macos.10-none/mach/mach_traps.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/mach_types.h b/lib/libc/include/x86_64-macos.10-none/mach/mach_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/mach_types.h
rename to lib/libc/include/x86_64-macos.10-none/mach/mach_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine.h b/lib/libc/include/x86_64-macos.10-none/mach/machine.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/_structs.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/_structs.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/_structs.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/_structs.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/boolean.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/boolean.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/boolean.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/boolean.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/exception.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/exception.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/exception.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/exception.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/kern_return.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/kern_return.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/kern_return.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/kern_return.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/processor_info.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/processor_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/processor_info.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/processor_info.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/rpc.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/rpc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/rpc.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/rpc.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/thread_state.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/thread_state.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/thread_state.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/thread_state.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/thread_status.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/thread_status.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/thread_status.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/thread_status.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/vm_param.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/vm_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/vm_param.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/vm_param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/machine/vm_types.h b/lib/libc/include/x86_64-macos.10-none/mach/machine/vm_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/machine/vm_types.h
rename to lib/libc/include/x86_64-macos.10-none/mach/machine/vm_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/memory_object_types.h b/lib/libc/include/x86_64-macos.10-none/mach/memory_object_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/memory_object_types.h
rename to lib/libc/include/x86_64-macos.10-none/mach/memory_object_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/message.h b/lib/libc/include/x86_64-macos.10-none/mach/message.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/message.h
rename to lib/libc/include/x86_64-macos.10-none/mach/message.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/port.h b/lib/libc/include/x86_64-macos.10-none/mach/port.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/port.h
rename to lib/libc/include/x86_64-macos.10-none/mach/port.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/processor_set.h b/lib/libc/include/x86_64-macos.10-none/mach/processor_set.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/processor_set.h
rename to lib/libc/include/x86_64-macos.10-none/mach/processor_set.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/task.h b/lib/libc/include/x86_64-macos.10-none/mach/task.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/task.h
rename to lib/libc/include/x86_64-macos.10-none/mach/task.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/task_info.h b/lib/libc/include/x86_64-macos.10-none/mach/task_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/task_info.h
rename to lib/libc/include/x86_64-macos.10-none/mach/task_info.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/task_policy.h b/lib/libc/include/x86_64-macos.10-none/mach/task_policy.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/task_policy.h
rename to lib/libc/include/x86_64-macos.10-none/mach/task_policy.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/task_special_ports.h b/lib/libc/include/x86_64-macos.10-none/mach/task_special_ports.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/task_special_ports.h
rename to lib/libc/include/x86_64-macos.10-none/mach/task_special_ports.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/thread_act.h b/lib/libc/include/x86_64-macos.10-none/mach/thread_act.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/thread_act.h
rename to lib/libc/include/x86_64-macos.10-none/mach/thread_act.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/thread_special_ports.h b/lib/libc/include/x86_64-macos.10-none/mach/thread_special_ports.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/thread_special_ports.h
rename to lib/libc/include/x86_64-macos.10-none/mach/thread_special_ports.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/thread_status.h b/lib/libc/include/x86_64-macos.10-none/mach/thread_status.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/thread_status.h
rename to lib/libc/include/x86_64-macos.10-none/mach/thread_status.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/vm_map.h b/lib/libc/include/x86_64-macos.10-none/mach/vm_map.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/vm_map.h
rename to lib/libc/include/x86_64-macos.10-none/mach/vm_map.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/vm_param.h b/lib/libc/include/x86_64-macos.10-none/mach/vm_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/vm_param.h
rename to lib/libc/include/x86_64-macos.10-none/mach/vm_param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/vm_prot.h b/lib/libc/include/x86_64-macos.10-none/mach/vm_prot.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/vm_prot.h
rename to lib/libc/include/x86_64-macos.10-none/mach/vm_prot.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/vm_statistics.h b/lib/libc/include/x86_64-macos.10-none/mach/vm_statistics.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/vm_statistics.h
rename to lib/libc/include/x86_64-macos.10-none/mach/vm_statistics.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach/vm_types.h b/lib/libc/include/x86_64-macos.10-none/mach/vm_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach/vm_types.h
rename to lib/libc/include/x86_64-macos.10-none/mach/vm_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/mach_debug/ipc_info.h b/lib/libc/include/x86_64-macos.10-none/mach_debug/ipc_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/mach_debug/ipc_info.h
rename to lib/libc/include/x86_64-macos.10-none/mach_debug/ipc_info.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/_mcontext.h b/lib/libc/include/x86_64-macos.10-none/machine/_mcontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/_mcontext.h
rename to lib/libc/include/x86_64-macos.10-none/machine/_mcontext.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/_param.h b/lib/libc/include/x86_64-macos.10-none/machine/_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/_param.h
rename to lib/libc/include/x86_64-macos.10-none/machine/_param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/_types.h b/lib/libc/include/x86_64-macos.10-none/machine/_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/_types.h
rename to lib/libc/include/x86_64-macos.10-none/machine/_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/endian.h b/lib/libc/include/x86_64-macos.10-none/machine/endian.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/endian.h
rename to lib/libc/include/x86_64-macos.10-none/machine/endian.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/limits.h b/lib/libc/include/x86_64-macos.10-none/machine/limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/limits.h
rename to lib/libc/include/x86_64-macos.10-none/machine/limits.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/param.h b/lib/libc/include/x86_64-macos.10-none/machine/param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/param.h
rename to lib/libc/include/x86_64-macos.10-none/machine/param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/signal.h b/lib/libc/include/x86_64-macos.10-none/machine/signal.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/signal.h
rename to lib/libc/include/x86_64-macos.10-none/machine/signal.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/machine/types.h b/lib/libc/include/x86_64-macos.10-none/machine/types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/machine/types.h
rename to lib/libc/include/x86_64-macos.10-none/machine/types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/malloc/_malloc.h b/lib/libc/include/x86_64-macos.10-none/malloc/_malloc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/malloc/_malloc.h
rename to lib/libc/include/x86_64-macos.10-none/malloc/_malloc.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/malloc/malloc.h b/lib/libc/include/x86_64-macos.10-none/malloc/malloc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/malloc/malloc.h
rename to lib/libc/include/x86_64-macos.10-none/malloc/malloc.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/math.h b/lib/libc/include/x86_64-macos.10-none/math.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/math.h
rename to lib/libc/include/x86_64-macos.10-none/math.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/net/if.h b/lib/libc/include/x86_64-macos.10-none/net/if.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/net/if.h
rename to lib/libc/include/x86_64-macos.10-none/net/if.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/net/if_var.h b/lib/libc/include/x86_64-macos.10-none/net/if_var.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/net/if_var.h
rename to lib/libc/include/x86_64-macos.10-none/net/if_var.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/net/route.h b/lib/libc/include/x86_64-macos.10-none/net/route.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/net/route.h
rename to lib/libc/include/x86_64-macos.10-none/net/route.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/netinet/in.h b/lib/libc/include/x86_64-macos.10-none/netinet/in.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/netinet/in.h
rename to lib/libc/include/x86_64-macos.10-none/netinet/in.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/netinet/tcp.h b/lib/libc/include/x86_64-macos.10-none/netinet/tcp.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/netinet/tcp.h
rename to lib/libc/include/x86_64-macos.10-none/netinet/tcp.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/netinet6/in6.h b/lib/libc/include/x86_64-macos.10-none/netinet6/in6.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/netinet6/in6.h
rename to lib/libc/include/x86_64-macos.10-none/netinet6/in6.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/objc/objc-api.h b/lib/libc/include/x86_64-macos.10-none/objc/objc-api.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/objc/objc-api.h
rename to lib/libc/include/x86_64-macos.10-none/objc/objc-api.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/objc/runtime.h b/lib/libc/include/x86_64-macos.10-none/objc/runtime.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/objc/runtime.h
rename to lib/libc/include/x86_64-macos.10-none/objc/runtime.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/os/base.h b/lib/libc/include/x86_64-macos.10-none/os/base.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/os/base.h
rename to lib/libc/include/x86_64-macos.10-none/os/base.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/os/object.h b/lib/libc/include/x86_64-macos.10-none/os/object.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/os/object.h
rename to lib/libc/include/x86_64-macos.10-none/os/object.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/pthread.h b/lib/libc/include/x86_64-macos.10-none/pthread.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/pthread.h
rename to lib/libc/include/x86_64-macos.10-none/pthread.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/pthread/sched.h b/lib/libc/include/x86_64-macos.10-none/pthread/sched.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/pthread/sched.h
rename to lib/libc/include/x86_64-macos.10-none/pthread/sched.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/pthread_impl.h b/lib/libc/include/x86_64-macos.10-none/pthread_impl.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/pthread_impl.h
rename to lib/libc/include/x86_64-macos.10-none/pthread_impl.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sched.h b/lib/libc/include/x86_64-macos.10-none/sched.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sched.h
rename to lib/libc/include/x86_64-macos.10-none/sched.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/signal.h b/lib/libc/include/x86_64-macos.10-none/signal.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/signal.h
rename to lib/libc/include/x86_64-macos.10-none/signal.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/simd/common.h b/lib/libc/include/x86_64-macos.10-none/simd/common.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/simd/common.h
rename to lib/libc/include/x86_64-macos.10-none/simd/common.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/simd/conversion.h b/lib/libc/include/x86_64-macos.10-none/simd/conversion.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/simd/conversion.h
rename to lib/libc/include/x86_64-macos.10-none/simd/conversion.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/simd/logic.h b/lib/libc/include/x86_64-macos.10-none/simd/logic.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/simd/logic.h
rename to lib/libc/include/x86_64-macos.10-none/simd/logic.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/simd/math.h b/lib/libc/include/x86_64-macos.10-none/simd/math.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/simd/math.h
rename to lib/libc/include/x86_64-macos.10-none/simd/math.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/simd/packed.h b/lib/libc/include/x86_64-macos.10-none/simd/packed.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/simd/packed.h
rename to lib/libc/include/x86_64-macos.10-none/simd/packed.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/simd/quaternion.h b/lib/libc/include/x86_64-macos.10-none/simd/quaternion.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/simd/quaternion.h
rename to lib/libc/include/x86_64-macos.10-none/simd/quaternion.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/spawn.h b/lib/libc/include/x86_64-macos.10-none/spawn.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/spawn.h
rename to lib/libc/include/x86_64-macos.10-none/spawn.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/stdio.h b/lib/libc/include/x86_64-macos.10-none/stdio.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/stdio.h
rename to lib/libc/include/x86_64-macos.10-none/stdio.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/stdlib.h b/lib/libc/include/x86_64-macos.10-none/stdlib.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/stdlib.h
rename to lib/libc/include/x86_64-macos.10-none/stdlib.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/string.h b/lib/libc/include/x86_64-macos.10-none/string.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/string.h
rename to lib/libc/include/x86_64-macos.10-none/string.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_attr_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_attr_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_attr_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_attr_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_cond_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_cond_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_cond_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_cond_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_condattr_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_condattr_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_condattr_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_condattr_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_rwlock_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_rwlock_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_rwlock_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_rwlock_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_rwlockattr_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_rwlockattr_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_rwlockattr_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_rwlockattr_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_types.h b/lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_pthread/_pthread_types.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_pthread/_pthread_types.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_select.h b/lib/libc/include/x86_64-macos.10-none/sys/_select.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_select.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_select.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_symbol_aliasing.h b/lib/libc/include/x86_64-macos.10-none/sys/_symbol_aliasing.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_symbol_aliasing.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_symbol_aliasing.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_types/_fd_def.h b/lib/libc/include/x86_64-macos.10-none/sys/_types/_fd_def.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_types/_fd_def.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_types/_fd_def.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_types/_int8_t.h b/lib/libc/include/x86_64-macos.10-none/sys/_types/_int8_t.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_types/_int8_t.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_types/_int8_t.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/_types/_ucontext.h b/lib/libc/include/x86_64-macos.10-none/sys/_types/_ucontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/_types/_ucontext.h
rename to lib/libc/include/x86_64-macos.10-none/sys/_types/_ucontext.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/acl.h b/lib/libc/include/x86_64-macos.10-none/sys/acl.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/acl.h
rename to lib/libc/include/x86_64-macos.10-none/sys/acl.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/attr.h b/lib/libc/include/x86_64-macos.10-none/sys/attr.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/attr.h
rename to lib/libc/include/x86_64-macos.10-none/sys/attr.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/cdefs.h b/lib/libc/include/x86_64-macos.10-none/sys/cdefs.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/cdefs.h
rename to lib/libc/include/x86_64-macos.10-none/sys/cdefs.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/event.h b/lib/libc/include/x86_64-macos.10-none/sys/event.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/event.h
rename to lib/libc/include/x86_64-macos.10-none/sys/event.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/fcntl.h b/lib/libc/include/x86_64-macos.10-none/sys/fcntl.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/fcntl.h
rename to lib/libc/include/x86_64-macos.10-none/sys/fcntl.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/ioccom.h b/lib/libc/include/x86_64-macos.10-none/sys/ioccom.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/ioccom.h
rename to lib/libc/include/x86_64-macos.10-none/sys/ioccom.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/kauth.h b/lib/libc/include/x86_64-macos.10-none/sys/kauth.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/kauth.h
rename to lib/libc/include/x86_64-macos.10-none/sys/kauth.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/mman.h b/lib/libc/include/x86_64-macos.10-none/sys/mman.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/mman.h
rename to lib/libc/include/x86_64-macos.10-none/sys/mman.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/mount.h b/lib/libc/include/x86_64-macos.10-none/sys/mount.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/mount.h
rename to lib/libc/include/x86_64-macos.10-none/sys/mount.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/param.h b/lib/libc/include/x86_64-macos.10-none/sys/param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/param.h
rename to lib/libc/include/x86_64-macos.10-none/sys/param.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/proc.h b/lib/libc/include/x86_64-macos.10-none/sys/proc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/proc.h
rename to lib/libc/include/x86_64-macos.10-none/sys/proc.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/proc_info.h b/lib/libc/include/x86_64-macos.10-none/sys/proc_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/proc_info.h
rename to lib/libc/include/x86_64-macos.10-none/sys/proc_info.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/resource.h b/lib/libc/include/x86_64-macos.10-none/sys/resource.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/resource.h
rename to lib/libc/include/x86_64-macos.10-none/sys/resource.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/shm.h b/lib/libc/include/x86_64-macos.10-none/sys/shm.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/shm.h
rename to lib/libc/include/x86_64-macos.10-none/sys/shm.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/socket.h b/lib/libc/include/x86_64-macos.10-none/sys/socket.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/socket.h
rename to lib/libc/include/x86_64-macos.10-none/sys/socket.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/sockio.h b/lib/libc/include/x86_64-macos.10-none/sys/sockio.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/sockio.h
rename to lib/libc/include/x86_64-macos.10-none/sys/sockio.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/spawn.h b/lib/libc/include/x86_64-macos.10-none/sys/spawn.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/spawn.h
rename to lib/libc/include/x86_64-macos.10-none/sys/spawn.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/stat.h b/lib/libc/include/x86_64-macos.10-none/sys/stat.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/stat.h
rename to lib/libc/include/x86_64-macos.10-none/sys/stat.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/sysctl.h b/lib/libc/include/x86_64-macos.10-none/sys/sysctl.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/sysctl.h
rename to lib/libc/include/x86_64-macos.10-none/sys/sysctl.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/syslimits.h b/lib/libc/include/x86_64-macos.10-none/sys/syslimits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/syslimits.h
rename to lib/libc/include/x86_64-macos.10-none/sys/syslimits.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/ucontext.h b/lib/libc/include/x86_64-macos.10-none/sys/ucontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/ucontext.h
rename to lib/libc/include/x86_64-macos.10-none/sys/ucontext.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/uio.h b/lib/libc/include/x86_64-macos.10-none/sys/uio.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/uio.h
rename to lib/libc/include/x86_64-macos.10-none/sys/uio.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/sys/un.h b/lib/libc/include/x86_64-macos.10-none/sys/un.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/sys/un.h
rename to lib/libc/include/x86_64-macos.10-none/sys/un.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/time.h b/lib/libc/include/x86_64-macos.10-none/time.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/time.h
rename to lib/libc/include/x86_64-macos.10-none/time.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/ucontext.h b/lib/libc/include/x86_64-macos.10-none/ucontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/ucontext.h
rename to lib/libc/include/x86_64-macos.10-none/ucontext.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/xlocale/_inttypes.h b/lib/libc/include/x86_64-macos.10-none/xlocale/_inttypes.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/xlocale/_inttypes.h
rename to lib/libc/include/x86_64-macos.10-none/xlocale/_inttypes.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/xlocale/_wchar.h b/lib/libc/include/x86_64-macos.10-none/xlocale/_wchar.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/xlocale/_wchar.h
rename to lib/libc/include/x86_64-macos.10-none/xlocale/_wchar.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/xpc/availability.h b/lib/libc/include/x86_64-macos.10-none/xpc/availability.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/xpc/availability.h
rename to lib/libc/include/x86_64-macos.10-none/xpc/availability.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/xpc/base.h b/lib/libc/include/x86_64-macos.10-none/xpc/base.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/xpc/base.h
rename to lib/libc/include/x86_64-macos.10-none/xpc/base.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/xpc/connection.h b/lib/libc/include/x86_64-macos.10-none/xpc/connection.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/xpc/connection.h
rename to lib/libc/include/x86_64-macos.10-none/xpc/connection.h
diff --git a/lib/libc/include/x86_64-macos.10-gnu/xpc/xpc.h b/lib/libc/include/x86_64-macos.10-none/xpc/xpc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.10-gnu/xpc/xpc.h
rename to lib/libc/include/x86_64-macos.10-none/xpc/xpc.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/_limits.h b/lib/libc/include/x86_64-macos.11-none/i386/_limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/_limits.h
rename to lib/libc/include/x86_64-macos.11-none/i386/_limits.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/_mcontext.h b/lib/libc/include/x86_64-macos.11-none/i386/_mcontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/_mcontext.h
rename to lib/libc/include/x86_64-macos.11-none/i386/_mcontext.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/_param.h b/lib/libc/include/x86_64-macos.11-none/i386/_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/_param.h
rename to lib/libc/include/x86_64-macos.11-none/i386/_param.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/_types.h b/lib/libc/include/x86_64-macos.11-none/i386/_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/_types.h
rename to lib/libc/include/x86_64-macos.11-none/i386/_types.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/eflags.h b/lib/libc/include/x86_64-macos.11-none/i386/eflags.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/eflags.h
rename to lib/libc/include/x86_64-macos.11-none/i386/eflags.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/endian.h b/lib/libc/include/x86_64-macos.11-none/i386/endian.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/endian.h
rename to lib/libc/include/x86_64-macos.11-none/i386/endian.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/limits.h b/lib/libc/include/x86_64-macos.11-none/i386/limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/limits.h
rename to lib/libc/include/x86_64-macos.11-none/i386/limits.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/param.h b/lib/libc/include/x86_64-macos.11-none/i386/param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/param.h
rename to lib/libc/include/x86_64-macos.11-none/i386/param.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/signal.h b/lib/libc/include/x86_64-macos.11-none/i386/signal.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/signal.h
rename to lib/libc/include/x86_64-macos.11-none/i386/signal.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/i386/types.h b/lib/libc/include/x86_64-macos.11-none/i386/types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/i386/types.h
rename to lib/libc/include/x86_64-macos.11-none/i386/types.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/libkern/OSAtomic.h b/lib/libc/include/x86_64-macos.11-none/libkern/OSAtomic.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/libkern/OSAtomic.h
rename to lib/libc/include/x86_64-macos.11-none/libkern/OSAtomic.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/libkern/OSAtomicDeprecated.h b/lib/libc/include/x86_64-macos.11-none/libkern/OSAtomicDeprecated.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/libkern/OSAtomicDeprecated.h
rename to lib/libc/include/x86_64-macos.11-none/libkern/OSAtomicDeprecated.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/libkern/OSAtomicQueue.h b/lib/libc/include/x86_64-macos.11-none/libkern/OSAtomicQueue.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/libkern/OSAtomicQueue.h
rename to lib/libc/include/x86_64-macos.11-none/libkern/OSAtomicQueue.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/libkern/OSSpinLockDeprecated.h b/lib/libc/include/x86_64-macos.11-none/libkern/OSSpinLockDeprecated.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/libkern/OSSpinLockDeprecated.h
rename to lib/libc/include/x86_64-macos.11-none/libkern/OSSpinLockDeprecated.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/libkern/i386/OSByteOrder.h b/lib/libc/include/x86_64-macos.11-none/libkern/i386/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/libkern/i386/OSByteOrder.h
rename to lib/libc/include/x86_64-macos.11-none/libkern/i386/OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/libkern/i386/_OSByteOrder.h b/lib/libc/include/x86_64-macos.11-none/libkern/i386/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/libkern/i386/_OSByteOrder.h
rename to lib/libc/include/x86_64-macos.11-none/libkern/i386/_OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/_structs.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/_structs.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/_structs.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/_structs.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/boolean.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/boolean.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/boolean.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/boolean.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/exception.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/exception.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/exception.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/exception.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/fp_reg.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/fp_reg.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/fp_reg.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/fp_reg.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/kern_return.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/kern_return.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/kern_return.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/kern_return.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/processor_info.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/processor_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/processor_info.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/processor_info.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/rpc.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/rpc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/rpc.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/rpc.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/thread_state.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/thread_state.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/thread_state.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/thread_state.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/thread_status.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/thread_status.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/thread_status.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/thread_status.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/vm_param.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/vm_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/vm_param.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/vm_param.h
diff --git a/lib/libc/include/x86_64-macos.11-gnu/mach/i386/vm_types.h b/lib/libc/include/x86_64-macos.11-none/mach/i386/vm_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.11-gnu/mach/i386/vm_types.h
rename to lib/libc/include/x86_64-macos.11-none/mach/i386/vm_types.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/_limits.h b/lib/libc/include/x86_64-macos.12-none/i386/_limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/_limits.h
rename to lib/libc/include/x86_64-macos.12-none/i386/_limits.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/_mcontext.h b/lib/libc/include/x86_64-macos.12-none/i386/_mcontext.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/_mcontext.h
rename to lib/libc/include/x86_64-macos.12-none/i386/_mcontext.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/_param.h b/lib/libc/include/x86_64-macos.12-none/i386/_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/_param.h
rename to lib/libc/include/x86_64-macos.12-none/i386/_param.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/_types.h b/lib/libc/include/x86_64-macos.12-none/i386/_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/_types.h
rename to lib/libc/include/x86_64-macos.12-none/i386/_types.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/eflags.h b/lib/libc/include/x86_64-macos.12-none/i386/eflags.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/eflags.h
rename to lib/libc/include/x86_64-macos.12-none/i386/eflags.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/endian.h b/lib/libc/include/x86_64-macos.12-none/i386/endian.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/endian.h
rename to lib/libc/include/x86_64-macos.12-none/i386/endian.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/limits.h b/lib/libc/include/x86_64-macos.12-none/i386/limits.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/limits.h
rename to lib/libc/include/x86_64-macos.12-none/i386/limits.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/param.h b/lib/libc/include/x86_64-macos.12-none/i386/param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/param.h
rename to lib/libc/include/x86_64-macos.12-none/i386/param.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/signal.h b/lib/libc/include/x86_64-macos.12-none/i386/signal.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/signal.h
rename to lib/libc/include/x86_64-macos.12-none/i386/signal.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/i386/types.h b/lib/libc/include/x86_64-macos.12-none/i386/types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/i386/types.h
rename to lib/libc/include/x86_64-macos.12-none/i386/types.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/libkern/OSAtomic.h b/lib/libc/include/x86_64-macos.12-none/libkern/OSAtomic.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/libkern/OSAtomic.h
rename to lib/libc/include/x86_64-macos.12-none/libkern/OSAtomic.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/libkern/OSAtomicDeprecated.h b/lib/libc/include/x86_64-macos.12-none/libkern/OSAtomicDeprecated.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/libkern/OSAtomicDeprecated.h
rename to lib/libc/include/x86_64-macos.12-none/libkern/OSAtomicDeprecated.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/libkern/OSAtomicQueue.h b/lib/libc/include/x86_64-macos.12-none/libkern/OSAtomicQueue.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/libkern/OSAtomicQueue.h
rename to lib/libc/include/x86_64-macos.12-none/libkern/OSAtomicQueue.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/libkern/OSSpinLockDeprecated.h b/lib/libc/include/x86_64-macos.12-none/libkern/OSSpinLockDeprecated.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/libkern/OSSpinLockDeprecated.h
rename to lib/libc/include/x86_64-macos.12-none/libkern/OSSpinLockDeprecated.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/libkern/i386/OSByteOrder.h b/lib/libc/include/x86_64-macos.12-none/libkern/i386/OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/libkern/i386/OSByteOrder.h
rename to lib/libc/include/x86_64-macos.12-none/libkern/i386/OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/libkern/i386/_OSByteOrder.h b/lib/libc/include/x86_64-macos.12-none/libkern/i386/_OSByteOrder.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/libkern/i386/_OSByteOrder.h
rename to lib/libc/include/x86_64-macos.12-none/libkern/i386/_OSByteOrder.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/_structs.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/_structs.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/_structs.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/_structs.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/boolean.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/boolean.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/boolean.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/boolean.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/exception.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/exception.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/exception.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/exception.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/fp_reg.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/fp_reg.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/fp_reg.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/fp_reg.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/kern_return.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/kern_return.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/kern_return.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/kern_return.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/processor_info.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/processor_info.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/processor_info.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/processor_info.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/rpc.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/rpc.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/rpc.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/rpc.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/thread_state.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/thread_state.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/thread_state.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/thread_state.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/thread_status.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/thread_status.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/thread_status.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/thread_status.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/vm_param.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/vm_param.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/vm_param.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/vm_param.h
diff --git a/lib/libc/include/x86_64-macos.12-gnu/mach/i386/vm_types.h b/lib/libc/include/x86_64-macos.12-none/mach/i386/vm_types.h
similarity index 100%
rename from lib/libc/include/x86_64-macos.12-gnu/mach/i386/vm_types.h
rename to lib/libc/include/x86_64-macos.12-none/mach/i386/vm_types.h
diff --git a/lib/std/target.zig b/lib/std/target.zig
index b11408cfce..27251f1d64 100644
--- a/lib/std/target.zig
+++ b/lib/std/target.zig
@@ -510,11 +510,7 @@ pub const Target = struct {
                 .other,
                 => return .eabi,
                 .openbsd,
-                .macos,
                 .freebsd,
-                .ios,
-                .tvos,
-                .watchos,
                 .fuchsia,
                 .kfreebsd,
                 .netbsd,
@@ -531,6 +527,10 @@ pub const Target = struct {
                 .glsl450,
                 .vulkan,
                 .plan9, // TODO specify abi
+                .macos,
+                .ios,
+                .tvos,
+                .watchos,
                 => return .none,
             }
         }
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 7ac1e49196..2c15cb95a3 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -4289,7 +4289,7 @@ fn getZigShippedLibCIncludeDirsDarwin(arena: Allocator, zig_lib_dir: []const u8,
 
     list[0] = try std.fmt.allocPrint(
         arena,
-        "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-{s}-gnu",
+        "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-{s}-none",
         .{ zig_lib_dir, arch_name, os_name },
     );
     list[1] = try std.fmt.allocPrint(
diff --git a/src/link/MachO/Dylib.zig b/src/link/MachO/Dylib.zig
index 57c8238827..b8b8f50e67 100644
--- a/src/link/MachO/Dylib.zig
+++ b/src/link/MachO/Dylib.zig
@@ -303,7 +303,7 @@ const TargetMatcher = struct {
         };
         const os = @tagName(target.os.tag);
         const abi: ?[]const u8 = switch (target.abi) {
-            .gnu => null,
+            .none => null,
             .simulator => "simulator",
             else => unreachable,
         };
diff --git a/src/stage1/target.cpp b/src/stage1/target.cpp
index da6565f0be..81377b5d49 100644
--- a/src/stage1/target.cpp
+++ b/src/stage1/target.cpp
@@ -971,11 +971,7 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {
         case OsOther:
             return ZigLLVM_EABI;
         case OsOpenBSD:
-        case OsMacOSX:
         case OsFreeBSD:
-        case OsIOS:
-        case OsTvOS:
-        case OsWatchOS:
         case OsFuchsia:
         case OsKFreeBSD:
         case OsNetBSD:
@@ -994,6 +990,10 @@ ZigLLVM_EnvironmentType target_default_abi(ZigLLVM_ArchType arch, Os os) {
         case OsGLSL450:
         case OsVulkan:
         case OsPlan9:
+        case OsMacOSX:
+        case OsIOS:
+        case OsTvOS:
+        case OsWatchOS:
             return ZigLLVM_UnknownEnvironment;
     }
     zig_unreachable();
diff --git a/src/target.zig b/src/target.zig
index c794ea52b0..14af2675d2 100644
--- a/src/target.zig
+++ b/src/target.zig
@@ -16,8 +16,8 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .aarch64, .os = .linux, .abi = .gnu },
     .{ .arch = .aarch64, .os = .linux, .abi = .musl },
     .{ .arch = .aarch64, .os = .windows, .abi = .gnu },
-    .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
-    .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
+    .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0 } },
+    .{ .arch = .aarch64, .os = .macos, .abi = .none, .os_ver = .{ .major = 12, .minor = 0 } },
     .{ .arch = .armeb, .os = .linux, .abi = .gnueabi },
     .{ .arch = .armeb, .os = .linux, .abi = .gnueabihf },
     .{ .arch = .armeb, .os = .linux, .abi = .musleabi },
@@ -70,9 +70,9 @@ pub const available_libcs = [_]ArchOsAbi{
     .{ .arch = .x86_64, .os = .linux, .abi = .gnux32 },
     .{ .arch = .x86_64, .os = .linux, .abi = .musl },
     .{ .arch = .x86_64, .os = .windows, .abi = .gnu },
-    .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 10, .minor = 0 } },
-    .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
-    .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
+    .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 10, .minor = 0 } },
+    .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 11, .minor = 0 } },
+    .{ .arch = .x86_64, .os = .macos, .abi = .none, .os_ver = .{ .major = 12, .minor = 0 } },
 };
 
 pub fn libCGenericName(target: std.Target) [:0]const u8 {