diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 10:49:02 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 10:49:02 +0100 |
commit | d805a6c0931ee5529de89f0b431e649f92bc34e8 (patch) | |
tree | 259bdbd93cb77113f23f5dfd6ddea399580cd5fc /mysqlc | |
parent | 6ed72842cdca2c534ce4984f8e8066703f8a3bdd (diff) |
Use visibility instead of version map file for mysqlc.uno.
Diffstat (limited to 'mysqlc')
-rw-r--r-- | mysqlc/source/makefile.mk | 18 | ||||
-rw-r--r-- | mysqlc/source/mysqlc.map | 7 |
2 files changed, 2 insertions, 23 deletions
diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk index 9405defd4bb6..97207ffe543d 100644 --- a/mysqlc/source/makefile.mk +++ b/mysqlc/source/makefile.mk @@ -32,6 +32,7 @@ PRJNAME=mysqlc TARGET=mysqlc ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN = TRUE LIBTARGET=NO EXTENSIONNAME:=mysql-connector-ooo @@ -52,21 +53,6 @@ EXTENSION_ZIPNAME:=$(EXTENSIONNAME) #------------------------------------------------------------------- -# set default symbol visibility / scope to hidden -.IF "$(COMNAME)" == "gcc3" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - CFLAGS += -fvisibility=hidden -.ENDIF # HAVE_GCC_VISIBILITY_FEATURE -.ENDIF # gcc3 - -.IF "$(COMNAME)" == "sunpro5" -.IF "$(CCNUMVER)" >= "00050005" - CFLAGS += -xldscope=hidden -.ENDIF # 5.5 -.ENDIF # sunpro5 - -#------------------------------------------------------------------- - # The headers delivered from C/C++ have a habit of putting a ";" after the closing bracked of a namespace, which # yields a warning with Solaris' compiler. Until this is fixed in C/C++, silence this warning .IF "$(OS)" == "SOLARIS" @@ -178,7 +164,7 @@ SHL1STDLIBS= \ $(SALHELPERLIB) \ $(CPPUHELPERLIB) -SHL1VERSIONMAP=$(TARGET).map +SHL1USE_EXPORTS = name SHL1LIBS= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1RPATH=OXT diff --git a/mysqlc/source/mysqlc.map b/mysqlc/source/mysqlc.map deleted file mode 100644 index 7c6d93f87852..000000000000 --- a/mysqlc/source/mysqlc.map +++ /dev/null @@ -1,7 +0,0 @@ -UDK_3_0_0 { - global: - component_writeInfo; - component_getFactory; - local: - *; -}; |