From 70b5fc6817677b9a1ff0a345f8044e27fd76f102 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 8 Aug 2008 16:30:27 +0000
Subject: [PATCH] 2008-08-08 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)    * bin/hb-mkslib.sh      + Added $(L_USR) to Darwin dynamic lib
 creation command line.

   * config/darwin/gcc.cf
     * Changed '-o ' to a more robust expression.
---
 harbour/ChangeLog            | 7 +++++++
 harbour/bin/hb-mkslib.sh     | 2 +-
 harbour/config/darwin/gcc.cf | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e64a7532cc..ceed750119 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-08 18:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * bin/hb-mkslib.sh
+     + Added $(L_USR) to Darwin dynamic lib creation command line.
+
+   * config/darwin/gcc.cf
+     * Changed '-o ' to a more robust expression.
+
 2008-08-08 13:18 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/hbsqlit3/sqlite3/sqlite3.c
      ! Pacified one OSX GCC unused var warning.
diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh
index 2fd72b61f5..4103f13ec8 100755
--- a/harbour/bin/hb-mkslib.sh
+++ b/harbour/bin/hb-mkslib.sh
@@ -119,7 +119,7 @@ if [ "${SLIB_EXT}" = ".dylib" ]; then
     ${CCPREFIX}gcc -dynamiclib -install_name "${BASE}.${MAJOR}${SLIB_EXT}" \
         -compatibility_version ${MAJOR}.${MINOR} -current_version ${VERSION} \
         -flat_namespace -undefined warning -multiply_defined suppress -single_module \
-        -o "${FULLNAME}" "${FULLNAME}.o" ${linker_options} && \
+        -o "${FULLNAME}" "${FULLNAME}.o" ${linker_options} ${L_USR} && \
     cd "${dir}" && \
     mv -f "${OTMPDIR}/${FULLNAME}" "${DSTDIR}${FULLNAME}" && \
     ln -sf "${FULLNAME}" "${DSTDIR}${BASE}.${MAJOR}${SLIB_EXT}" && \
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index 1d402dd9ed..380686c87d 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -14,7 +14,8 @@ LIB_EXT = .a
 CC = $(CCACHE) cc
 CC_IN = -c
 # NOTE: The ending space after -o is important, please preserve it.
-CC_OUT = -o 
+#       Now solved with '$(subst x,x, )' expression.
+CC_OUT = -o$(subst x,x, )
 
 # -no-cpp-precomp prevents from using buggy precompiled headers
 CPPFLAGS = -no-cpp-precomp -I. -I$(TOP)include -I$(HB_INC_COMPILE)