# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.

Call compiler directly to build & link, avoiding libtool, so we can pass
the compiler & linker flags we want.

diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index b84bc5d..d6c19bc 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -22,7 +22,7 @@ LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
 #
-O  := lo
+O  := o
 SO := o
 
 
@@ -36,7 +36,7 @@ E := @EXEEXT@
 # The library file extension (for standard and static libraries).  This can
 # be .a, .lib, etc., depending on the platform.
 #
-A  := la
+A  := so.6
 SA := a
 
 
@@ -85,11 +85,11 @@ CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
 #
 ANSIFLAGS := @XX_ANSIFLAGS@
 
-# C compiler to use -- we use libtool!
+# C compiler to use -- we hate libtool!
 #
 #
 CCraw := $(CC)
-CC    := $(LIBTOOL) --mode=compile $(CCraw)
+CC    := $(CCraw) -Kpic
 
 # Linker flags.
 #
@@ -106,9 +106,8 @@ CCexe        := $(CCraw_build)	# used to compile `apinames' only
 
 # Library linking
 #
-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-                          -rpath $(libdir) -version-info $(version_info) \
-                          $(LDFLAGS) -no-undefined \
-                          # -export-symbols $(EXPORTS_LIST)
+LINK_LIBRARY = $(CCraw) -G @CFLAGS@ -o $@ $(OBJECTS_LIST) \
+                          -R $(libdir) -h $(@F) -mc \
+                          $(LDFLAGS)
 
 # EOF