summaryrefslogtreecommitdiff
path: root/setup_native/scripts/source
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-03-03 16:34:18 +0000
committerKurt Zenker <kz@openoffice.org>2005-03-03 16:34:18 +0000
commitcfd266dbb3fd046575d076e6d49f4f6c1916c1e7 (patch)
tree3f409c739756912a4e68051f2590372b3cb868e4 /setup_native/scripts/source
parentc8a19799108f8f132692572be11c76aa68ddfda7 (diff)
INTEGRATION: CWS solarisgcc02 (1.3.22); FILE MERGED
2005/02/15 20:20:53 pjanik 1.3.22.1: #i42555#: Do not define -DKERNEL for gcc on Solaris/x86. Patch contributed by Taniguchi Yasuaki (JCA).
Diffstat (limited to 'setup_native/scripts/source')
-rw-r--r--setup_native/scripts/source/makefile.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/setup_native/scripts/source/makefile.mk b/setup_native/scripts/source/makefile.mk
index 9e8054668a1f..49d9e07a63fb 100644
--- a/setup_native/scripts/source/makefile.mk
+++ b/setup_native/scripts/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: vg $ $Date: 2005-02-24 16:18:05 $
+# last change: $Author: kz $ $Date: 2005-03-03 17:34:18 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -86,6 +86,7 @@ CFLAGS+=-D_GNU_SOURCE
.IF "$(OS)" == "SOLARIS"
.IF "$(CPU)" == "I"
+.IF "$(COM)" != "GCC"
CFLAGS+=-D_KERNEL
.ENDIF
.ENDIF