---

yaml
---
r: 150910
b: refs/heads/try2
c: 32a81d1
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 30ff17f809869dec37d7b501fb532dc88fd47832
+refs/heads/try2: 32a81d1e161a8b4a498c88ddb79955775d18fbfd
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/configure

@@ -938,13 +938,15 @@ do
 
             LLVM_CXX_64="ccache clang++ -Qunused-arguments"
             LLVM_CC_64="ccache clang -Qunused-arguments"
+            LLVM_OPTS="$LLVM_OPTS --enable-libcpp"
             ;;
             ("clang")
             LLVM_CXX_32="clang++ -m32 -Qunused-arguments"
             LLVM_CC_32="clang -m32 -Qunused-arguments"
 
             LLVM_CXX_64="clang++ -Qunused-arguments"
             LLVM_CC_64="clang -Qunused-arguments"
+            LLVM_OPTS="$LLVM_OPTS --enable-libcpp"
             ;;
             ("ccache gcc")
             LLVM_CXX_32="ccache g++ -m32"

branches/try2/src/etc/mklldeps.py

@@ -56,7 +56,7 @@
     f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
 
     # LLVM libs
-    args = [llconfig, '--libs']
+    args = [llconfig, '--libs', '--system-libs']
     args.extend(components)
     proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = proc.communicate()
@@ -65,9 +65,13 @@
         print("failed to run llconfig: args = `{}`".format(args))
         sys.exit(1)
 
-    for lib in out.strip().split(' '):
-        lib = lib[2:] # chop of the leading '-l'
-        f.write("#[link(name = \"" + lib + "\", kind = \"static\")]\n")
+    for lib in out.strip().replace("\n", ' ').split(' '):
+        lib = lib.strip()[2:] # chop of the leading '-l'
+        f.write("#[link(name = \"" + lib + "\"")
+        # LLVM libraries are all static libraries
+        if 'LLVM' in lib:
+            f.write(", kind = \"static\"")
+        f.write(")]\n")
 
     # LLVM ldflags
     args = [llconfig, '--ldflags']
@@ -82,8 +86,19 @@
         if lib[:2] == "-l":
             f.write("#[link(name = \"" + lib[2:] + "\")]\n")
 
-    #extra
-    f.write("#[link(name = \"stdc++\")]\n")
-    if os == 'win32':
-        f.write("#[link(name = \"imagehlp\")]\n")
+    # C++ runtime library
+    args = [llconfig, '--cxxflags']
+    proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    out, err = proc.communicate()
+
+    if err:
+        print("failed to run llconfig: args = `{}`".format(args))
+        sys.exit(1)
+
+    if 'stdlib=libc++' in out:
+        f.write("#[link(name = \"c++\")]\n")
+    else:
+        f.write("#[link(name = \"stdc++\")]\n")
+
+    # Attach everything to an extern block
     f.write("extern {}\n")