[csw-devel] SF.net SVN: gar:[21397] csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile

[lblume at users.sourceforge.net]

Revision: 21397
          http://gar.svn.sourceforge.net/gar/?rev=21397&view=rev
Author:   lblume
Date:     2013-06-26 18:25:44 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
mysql5/branches/mysql-5.6.x: Minor, maybe useless changes to linking

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2013-06-26 14:47:13 UTC (rev 21396)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.6.x/Makefile	2013-06-26 18:25:44 UTC (rev 21397)
@@ -50,6 +50,7 @@
 EXTRA_CXXFLAGS-i386  = -fsimple=1 -ftrap=%none -nofstore -xbuiltin=%all -features=no%except -xlibmil -xlibmopt
 EXTRA_CFLAGS   += $(EXTRA_CFLAGS-$(GARCH)) -g -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -xnorunpath
 EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(GARCH)) -g0 -mt -KPIC -DDBUG_OFF -DHAVE_OPENSSL -DMULTI_THREADED -lm -norunpath
+EXTRA_LDFLAGS += -Bdirect
 
 # The official build used -xO2 on 32 bit x86, -xO3 for 64 bit
 # Use that for all builds
@@ -185,7 +186,8 @@
 CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix)
 CMAKE_ARGS += -DC_FLAGS="$(CFLAGS)"
 CMAKE_ARGS += -DCXX_FLAGS="$(CXXFLAGS)"
-CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS"$(LDFLAGS)"
+CMAKE_ARGS += -DCMAKE_C_LINK_FLAGS="$(LDFLAGS)"
+CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS="$(LDFLAGS)"
 CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)"
 CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)"
 CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.