From 3fa2e89a7a7a939a7ea8c756c40d55ff9b6df2ac Mon Sep 17 00:00:00 2001
From: Joseph Crail <jbcrail@gmail.com>
Date: Wed, 8 Jul 2015 20:34:48 -0400
Subject: [PATCH] Fix OS X build errors for stdbuf.

I removed unused linker flags, added platform-specific linker flags, and
used DYLD_LIBRARY_PATH (instead of DYLD_INSERT_LIBRARIES) for loading
the dynamic library. I also removed an unused variable mutation.
---
 Makefile                | 6 ++++--
 src/stdbuf/libstdbuf.rs | 2 +-
 src/stdbuf/stdbuf.rs    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7dab6188c..fdcdce006 100644
--- a/Makefile
+++ b/Makefile
@@ -147,9 +147,11 @@ SYSTEM := $(shell uname)
 DYLIB_EXT := 
 ifeq ($(SYSTEM),Linux)
 	DYLIB_EXT    := so
+	DYLIB_FLAGS  := -shared
 endif
 ifeq ($(SYSTEM),Darwin)
 	DYLIB_EXT    := dylib
+	DYLIB_FLAGS  := -dynamiclib
 endif
 
 # Libaries to install
@@ -310,8 +312,8 @@ $(BUILDDIR)/uutils: $(SRCDIR)/uutils/uutils.rs $(BUILDDIR)/mkuutils $(RLIB_PATHS
 $(BUILDDIR)/libstdbuf.$(DYLIB_EXT): $(SRCDIR)/stdbuf/libstdbuf.rs $(SRCDIR)/stdbuf/libstdbuf.c $(SRCDIR)/stdbuf/libstdbuf.h | $(BUILDDIR)
 	cd $(SRCDIR)/stdbuf && \
 	$(RUSTC) libstdbuf.rs && \
-	$(CC) -c -Wall -Werror -fpic libstdbuf.c -L. -llibstdbuf.a && \
-	$(CC) -shared -o libstdbuf.$(DYLIB_EXT) -Wl,--whole-archive liblibstdbuf.a -Wl,--no-whole-archive libstdbuf.o -lpthread && \
+	$(CC) -c -Wall -Werror -fPIC libstdbuf.c && \
+	$(CC) $(DYLIB_FLAGS) -o libstdbuf.$(DYLIB_EXT) liblibstdbuf.a libstdbuf.o && \
 	mv *.$(DYLIB_EXT) $(BUILDDIR) && $(RM) *.o && $(RM) *.a
 	
 $(BUILDDIR)/stdbuf: $(BUILDDIR)/libstdbuf.$(DYLIB_EXT)
diff --git a/src/stdbuf/libstdbuf.rs b/src/stdbuf/libstdbuf.rs
index 2d7420759..1dbb0587b 100644
--- a/src/stdbuf/libstdbuf.rs
+++ b/src/stdbuf/libstdbuf.rs
@@ -33,7 +33,7 @@ fn set_buffer(stream: *mut FILE, value: &str) {
             (_IOFBF, buff_size as size_t)
         }
     };
-    let mut res: c_int;
+    let res: c_int;
     unsafe {
         let buffer: *mut c_char = ptr::null_mut();
         assert!(buffer.is_null());
diff --git a/src/stdbuf/stdbuf.rs b/src/stdbuf/stdbuf.rs
index 1423d86a7..ff567f9e4 100644
--- a/src/stdbuf/stdbuf.rs
+++ b/src/stdbuf/stdbuf.rs
@@ -59,7 +59,7 @@ fn preload_strings() -> (&'static str, &'static str) {
 
 #[cfg(target_os = "macos")]
 fn preload_strings() -> (&'static str, &'static str) { 
-    ("DYLD_INSERT_LIBRARIES", ".dylib")
+    ("DYLD_LIBRARY_PATH", ".dylib")
 }
 
 #[cfg(not(any(target_os = "linux", target_os = "macos")))]