[pkg-d-commits] [ldc] 63/149: druntime: Remove src/ldc/osx_tls.c, use upstream src/rt/osx_tls.c

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.2.0
in repository ldc.

commit 265db37a5ff1c2fed76df4fc458115f98a684b91
Author: Martin <noone at nowhere.com>
Date:   Sun Jan 29 23:01:22 2017 +0100

    druntime: Remove src/ldc/osx_tls.c, use upstream src/rt/osx_tls.c
---
 runtime/CMakeLists.txt | 4 ++--
 runtime/druntime       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index fd08f71..c09815d 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -71,8 +71,8 @@ list(REMOVE_ITEM DCRT_D
 )
 file(GLOB DCRT_C ${RUNTIME_DIR}/src/rt/*.c)
 list(REMOVE_ITEM DCRT_C ${RUNTIME_DIR}/src/rt/deh.c ${RUNTIME_DIR}/src/rt/dylib_fixes.c)
-if(APPLE)
-    list(APPEND DCRT_C ${RUNTIME_DIR}/src/ldc/osx_tls.c)
+if(NOT APPLE)
+    list(REMOVE_ITEM DCRT_C ${RUNTIME_DIR}/src/rt/osx_tls.c)
 endif()
 if(MSVC)
     list(APPEND DCRT_C ${RUNTIME_DIR}/src/ldc/msvc.c)
diff --git a/runtime/druntime b/runtime/druntime
index f1a06df..b0cf01a 160000
--- a/runtime/druntime
+++ b/runtime/druntime
@@ -1 +1 @@
-Subproject commit f1a06dfe975c7fb8e4376e68e4bc0994dc0137d2
+Subproject commit b0cf01a3a3eae541dab668ed20acf3076b7e1497

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git