4964 nl_langinfo(CRNCYSTR) returns wrong alignment character
4999 libc test suite enhancements
4939 desire wcsnrtombs() function
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Approved by: TBD

@@ -18,10 +18,11 @@
 #
 # CDDL HEADER END
 #
 #
 # Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2014 Garrett D'Amore <garrett@damore.org>
 #
 
 # rebind basic build macros to 64-bit versions
 
 CFLAGS=         $(CFLAGS64)

@@ -40,19 +41,10 @@
 CTF_FLAGS=      $(CTF_FLAGS_64)
 
 OFFSETS_CREATE= $(OFFSETS_CREATE64)
 
 #
-# Some library path hackery, to allow building of partial workspaces
-# and properly set the 64-bit library paths with 'ws'
-#
-LDLIBS1=        $(ENVLDLIBS1:%=%/$(MACH64))
-LDLIBS2=        $(ENVLDLIBS2:%=%/$(MACH64))
-LDLIBS3=        $(ENVLDLIBS3:%=%/$(MACH64))
-LDLIBS64 =      $(LDLIBS1) $(LDLIBS2) $(LDLIBS3)
-LDLIBS64 +=     $(ADJUNCT_PROTO:%=-L%/usr/lib/$(MACH64) -L%/lib/$(MACH64))
-#
 # Moved these up to the top level here, so they can be overridden
 #
 LDLIBS.cmd =    $(LDLIBS64)
 LDLIBS.lib =    $(LDLIBS64)