Merge branch 'master' of https://github.com/hpux735/swift-corelibs-foundation

hpux735 · hpux735 · commit 74262b6bf4a1 · 2015-12-23T18:36:12.000Z
Conflicts:
	Foundation/NSXMLNodeOptions.swift
diff --git a/lib/target.py b/lib/target.py
@@ -364,6 +364,7 @@ def swift_triple(self):
         if self.sdk == OSType.MacOSX:
             return None
         elif self.sdk == OSType.Linux:
+            # FIXME: It would be nice to detect the host ABI here
             if self.arch == ArchType.arm:
                 triple += "-unknown-linux-gnueabihf"
             else:
