diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-11 14:33:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-11 14:33:34 +0000 |
| commit | 8847c607188f850128bb2113be7ce5880a5d59e6 (patch) | |
| tree | e6b047e478d7efdde3aaffc610e83a234cc1109a /solenv/inc/unxscoi.mk | |
| parent | 81e8d9e82850a1d0621164d4f773385213259fcb (diff) | |
INTEGRATION: CWS ause030 (1.6.130); FILE MERGED
2005/06/20 13:34:42 hjs 1.6.130.1: #i47954# introduce ARCH_FLAG
Diffstat (limited to 'solenv/inc/unxscoi.mk')
| -rw-r--r-- | solenv/inc/unxscoi.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk index c50a1c913d1a..286e03b5459d 100644 --- a/solenv/inc/unxscoi.mk +++ b/solenv/inc/unxscoi.mk @@ -2,9 +2,9 @@ # # $RCSfile: unxscoi.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: hr $ $Date: 2005-02-11 15:31:21 $ +# last change: $Author: kz $ $Date: 2005-07-11 15:33:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -69,14 +69,17 @@ CDEFS+=-D_PTHREADS -D_REENTRANT CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE -DX86 -DNEW_SOLAR # kann c++ was c braucht?? +# architecture dependent flags for the C and C++ compiler that can be changed by +# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build +ARCH_FLAGS*=-mpentium + CXX*=/nw386/dev/s/solenv/unxscoi/bin/g++ CC*=/nw386/dev/s/solenv/unxscoi/bin/gcc CFLAGS=-c $(INCLUDE) -CFLAGSCC=-mpentium -CFLAGSCXX= -mpentium +CFLAGSCC=$(ARCH_FLAGS) CFLAGSEXCEPTIONS=-fexceptions CFLAGS_NO_EXCEPTIONS=-fno-exceptions -CFLAGSCXX=-mpentium -fguiding-decls -frtti +CFLAGSCXX=-fguiding-decls -frtti $(ARCH_FLAGS) CFLAGSCXX+= -Wno-ctor-dtor-privacy PICSWITCH:=-fPIC CFLAGSOBJGUIST=$(PICSWITCH) |