diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 15:00:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-06 15:00:31 +0000 |
| commit | 1d0f67aa16c3c24c221413d30c216f1f10dd214c (patch) | |
| tree | e07e89698e6743526834ddb716d5fd8ece91649b /odk/settings | |
| parent | 6708e5373872ceead172ebd82c9b35405d7cfa1c (diff) | |
INTEGRATION: CWS execshellmacrogone (1.22.26); FILE MERGED
2007/10/24 08:43:08 rene 1.22.26.2: RESYNC: (1.22-1.23); FILE MERGED
2007/10/24 06:35:42 rene 1.22.26.1: #i79760# krs patches for supressing "Executing shell macro..." output
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 554153ebf879..c42e12821d8a 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -2,7 +2,7 @@ # This file have to updated/extended for other platforms. # test for the platform -PLATFORM := $(shell $(PRJ)/config.guess | cut -d"-" -f3,4) +PLATFORM := $(shell @$(PRJ)/config.guess | cut -d"-" -f3,4) # config.guess is missing for windows. We rely on getting "" in this case. ifeq "$(PLATFORM)" "" @@ -128,7 +128,7 @@ endif ifneq (,$(findstring solaris,$(PLATFORM))) # Settings for Solaris using Sun Workshop compiler -PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) +PROCTYPE := $(shell @$(PRJ)/config.guess | cut -d"-" -f1) ifeq "$(PROCTYPE)" "sparc" PLATFORM=solsparc @@ -222,7 +222,7 @@ endif ifeq "$(PLATFORM)" "linux-gnu" # Settings for Linux using gcc compiler -PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1) +PROCTYPE := $(shell @$(PRJ)/config.guess | cut -d "-" -f1) # Default is linux on a intel machine PLATFORM=linux @@ -262,7 +262,7 @@ SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell $(CC) -dumpversion) +GCC_VERSION=$(shell @$(CC) -dumpversion) COMID=gcc3 CPPU_ENV=gcc3 @@ -360,7 +360,7 @@ SHAREDLIB_EXT=dylib SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell $(CC) -dumpversion) +GCC_VERSION=$(shell @$(CC) -dumpversion) COMID=gcc3 CPPU_ENV=gcc3 @@ -430,7 +430,7 @@ endif ifneq (,$(findstring freebsd,$(PLATFORM))) # Settings for FreeBSD using gcc compiler -PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1) +PROCTYPE := $(shell @$(PRJ)/config.guess | cut -d"-" -f1) # Default is freebsd on a intel machine PLATFORM=freebsd @@ -451,9 +451,9 @@ SHAREDLIB_EXT=so SHAREDLIB_PRE=lib SHAREDLIB_OUT=$(OUT_LIB) -GCC_VERSION=$(shell $(CC) -dumpversion) +GCC_VERSION=$(shell @$(CC) -dumpversion) -ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3" +ifeq "$(shell @echo $(GCC_VERSION) | cut -c 1)" "3" COMID=gcc3 CPPU_ENV=gcc3 else |