fix link error

graydon · Jan 2, 2012 · 274fc1b · 274fc1b
1 parent 21eadbe
commit 274fc1b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/mk/platform.mk b/mk/platform.mk
@@ -25,7 +25,7 @@ ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)
   CFG_LIB_NAME=lib$(1).so
   CFG_LIB_GLOB=lib$(1)-*.so
   CFG_GCCISH_CFLAGS += -fPIC -I/usr/local/include
-  CFG_GCCISH_LINK_FLAGS += -shared -fPIC -lpthread -lrt -L/usr/local/lib -lexecinfo
+  CFG_GCCISH_LINK_FLAGS += -shared -fPIC -lpthread -lrt
   CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list=
   CFG_GCCISH_PRE_LIB_FLAGS := -Wl,-whole-archive
   CFG_GCCISH_POST_LIB_FLAGS := -Wl,-no-whole-archive

diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
@@ -660,7 +660,10 @@ fn link_binary(sess: session::session,
     }
 
     if sess.get_targ_cfg().os == session::os_freebsd {
-        gcc_args += ["-lrt", "-L/usr/local/lib", "-lexecinfo"];
+        gcc_args += ["-lrt", "-L/usr/local/lib", "-lexecinfo",
+                     "-L/usr/local/lib/gcc46",
+                     "-L/usr/local/lib/gcc44", "-lstdc++",
+                     "-Wl,-z,origin"];
     }
 
     // OS X 10.6 introduced 'compact unwind info', which is produced by the

diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
@@ -33,7 +33,13 @@ def scrub(b):
               "lib/std-*.dll",
               "lib/rustc-*.dll",
               "lib/rustrt.dll",
-              "lib/rustllvm.dll"]
+              "lib/rustllvm.dll"],
+    "freebsd": ["bin/rustc",
+                "lib/libcore-*.so",
+                "lib/libstd-*.so",
+                "lib/librustc-*.so",
+                "lib/librustrt.so",
+                "lib/librustllvm.so"]
     }
 
 def parse_line(n, line):
@@ -73,6 +79,8 @@ def get_kernel(triple):
         return "winnt"
     if os_name == "darwin":
         return "macos"
+    if os_name == "freebsd":
+        return "freebsd"
     return "linux"
 
 def get_cpu(triple):