[Lldb-commits] [PATCH] D14036: [debugserver] Fix OSX build for older XCode versions after r251091.

[Dawn Perchik via lldb-commits]

dawn created this revision.
dawn added reviewers: jasonmolenda, clayborg.
dawn added a subscriber: lldb-commits.
dawn set the repository for this revision to rL LLVM.

svn r251091 introduced references to LC_VERSION_MIN_TVOS and 
LC_VERSION_MIN_WATCHOS which aren't defined in XCode versions older than 7.  
This patch fixes the build by skipping the code if TARGET_OS_TV or 
TARGET_OS_WATCH aren't defined.

Repository:
  rL LLVM

http://reviews.llvm.org/D14036

Files:
  tools/debugserver/source/RNBRemote.cpp

Index: tools/debugserver/source/RNBRemote.cpp
===================================================================
--- tools/debugserver/source/RNBRemote.cpp
+++ tools/debugserver/source/RNBRemote.cpp
@@ -5846,17 +5846,21 @@
                     DNBLogThreadedIf (LOG_RNB_PROC, "LC_VERSION_MIN_MACOSX -> 
'ostype:macosx;'");
                     break;
 
+#if defined (TARGET_OS_TV) && TARGET_OS_TV == 1
                 case LC_VERSION_MIN_TVOS:
                     os_handled = true;
                     rep << "ostype:tvos;";
                     DNBLogThreadedIf (LOG_RNB_PROC, "LC_VERSION_MIN_TVOS -> 
'ostype:tvos;'");
                     break;
+#endif
 
+#if defined (TARGET_OS_WATCH) && TARGET_OS_WATCH == 1
                 case LC_VERSION_MIN_WATCHOS:
                     os_handled = true;
                     rep << "ostype:watchos;";
                     DNBLogThreadedIf (LOG_RNB_PROC, "LC_VERSION_MIN_WATCHOS -> 
'ostype:watchos;'");
                     break;
+#endif
 
                 default:
                     break;



Index: tools/debugserver/source/RNBRemote.cpp
===================================================================
--- tools/debugserver/source/RNBRemote.cpp
+++ tools/debugserver/source/RNBRemote.cpp
@@ -5846,17 +5846,21 @@
                     DNBLogThreadedIf (LOG_RNB_PROC, "LC_VERSION_MIN_MACOSX -> 'ostype:macosx;'");
                     break;
 
+#if defined (TARGET_OS_TV) && TARGET_OS_TV == 1
                 case LC_VERSION_MIN_TVOS:
                     os_handled = true;
                     rep << "ostype:tvos;";
                     DNBLogThreadedIf (LOG_RNB_PROC, "LC_VERSION_MIN_TVOS -> 'ostype:tvos;'");
                     break;
+#endif
 
+#if defined (TARGET_OS_WATCH) && TARGET_OS_WATCH == 1
                 case LC_VERSION_MIN_WATCHOS:
                     os_handled = true;
                     rep << "ostype:watchos;";
                     DNBLogThreadedIf (LOG_RNB_PROC, "LC_VERSION_MIN_WATCHOS -> 'ostype:watchos;'");
                     break;
+#endif
 
                 default:
                     break;

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits