diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:10:28 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 12:10:28 +0000 |
| commit | 1da872df6700fa6f82d20b23ef4dcb920615fa89 (patch) | |
| tree | 0f676361ac05f3a72ca4392e4d2a8a65986996e5 /stlport | |
| parent | 245c67634d1471bfc31dd5a9534a774e3fdf34eb (diff) | |
INTEGRATION: CWS configure21 (1.39.6); FILE MERGED
2007/07/09 23:23:03 rene 1.39.6.2: #i10000# both also here
2007/05/06 16:08:52 rene 1.39.6.1: support --hash-style= from binutils
Diffstat (limited to 'stlport')
| -rw-r--r-- | stlport/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 021736173763..6c58d14f8408 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.39 $ +# $Revision: 1.40 $ # -# last change: $Author: vg $ $Date: 2007-03-26 15:38:49 $ +# last change: $Author: hr $ $Date: 2007-07-31 13:10:28 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -154,6 +154,9 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER) # build in parallel BUILD_FLAGS+= -j$(MAXPROCESS) .ENDIF +.IF "$(HAVE_LD_HASH_STYLE)" == "TRUE" +CXX+= -Wl,--hash-style=both +.ENDIF .IF "$(COM)"=="C52" BUILD_ACTION=make |