strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sb83 (1.22.14); FILE MERGED

Browse source 
2008/03/17 09:00:44 sb 1.22.14.6: RESYNC: (1.27-1.28); FILE MERGED
2008/02/01 13:28:08 sb 1.22.14.5: RESYNC: (1.24-1.27); FILE MERGED
2008/02/01 11:02:16 sb 1.22.14.4: #i84200# added SHLnRPATH=OXT for libraries within extensions (that only link against URE libs)
2008/01/11 14:15:37 sb 1.22.14.3: #i84200# make --without-stlport the default for unxmacx
2008/01/09 10:51:44 sb 1.22.14.2: RESYNC: (1.22-1.24); FILE MERGED
2008/01/09 09:42:37 sb 1.22.14.1: #i84200# use APP|SHLnRPATH (-> LINKFLAGSRUNPATH_xxx) to control the install_name on unxmacx, use new macosx-change-install-names to adapt recorded install_names of linked-against libraries to correct paths in the target environment
This commit is contained in:
Vladimir Glazounov 2008-03-18 12:11:14 +00:00
parent 3af1671e69
commit c8ec0f9e4c
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
solenv/inc/unxmacx.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: unxmacx.mk,v $
#
# $Revision: 1.28 $
# $Revision: 1.29 $
#
# last change: $Author: kz $ $Date: 2008-03-07 16:55:51 $
# last change: $Author: vg $ $Date: 2008-03-18 13:11:14 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -143,10 +143,12 @@ CFLAGSOPT=-O2 -fno-strict-aliasing
CFLAGSNOOPT=-O0
# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
# -Wshadow does not work for C++ as /usr/include/c++/4.0.0/ext/hashtable.h
# l. 717 contains a declaration of __cur2 shadowing the declaration at l. 705,
# in template code for which a #pragma gcc system_header would not work:
# -Wextra doesn not work for gcc-3.3
CFLAGSWARNCC=-Wall -Wendif-labels
CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
-Wno-non-virtual-dtor
CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
CFLAGSWALLCC=$(CFLAGSWARNCC)
CFLAGSWALLCXX=$(CFLAGSWARNCXX)
CFLAGSWERRCC=-Werror
@ -193,8 +195,14 @@ LINK*=$(CXX)
LINKC*=$(CC)
LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
LINKFLAGSRUNPATH*=-Wl
LINKFLAGS=$(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# Very long install_names are needed so that install_name_tool -change later on
# does not complain that "larger updated load commands do not fit:"
LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB$/$(@:f)'
LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO$/$(@:f)'
LINKFLAGSRUNPATH_BRAND=
LINKFLAGSRUNPATH_OXT=
LINKFLAGS=$(LINKFLAGSDEFS)
# [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
.IF "$(GUIBASE)" == "aqua"
@ -210,9 +218,9 @@ LINKFLAGS+=$(EXTRA_LINKFLAGS)
# Random link flags dealing with different cases of linking
LINKFLAGSAPPGUI=-bind_at_load
LINKFLAGSSHLGUI=-dynamiclib -single_module -install_name '@executable_path$/$(@:f)'
LINKFLAGSSHLGUI=-dynamiclib -single_module
LINKFLAGSAPPCUI=-bind_at_load
LINKFLAGSSHLCUI=-dynamiclib -single_module -install_name '@executable_path$/$(@:f)'
LINKFLAGSSHLCUI=-dynamiclib -single_module
LINKFLAGSTACK=
LINKFLAGSPROF=