diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 12:13:29 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 12:13:29 +0000 |
| commit | 3d4c36a23d9ea66d900943f9359994c821021c27 (patch) | |
| tree | e3f12a80bd3ffd4a8875f4b6a4c205978dc77d3b | |
| parent | 458ec3ef2c480bf687150faf5aa11a0b3b2d53e1 (diff) | |
INTEGRATION: CWS newportstl (1.26.2); FILE MERGED
2007/12/19 12:13:29 cmc 1.26.2.3: #i82715# add linux arch that don't match pattern
2007/12/19 12:07:33 cmc 1.26.2.2: #i82715# default to using gcc stl for new (including x86_64) linux ports
2007/12/17 15:26:58 cmc 1.26.2.1: #i82715# default to using gcc stl for new (including x86_64) linux ports
| -rw-r--r-- | odk/settings/settings.mk | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 028fe1052c16..fc169028e9c2 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -222,31 +222,41 @@ endif ifeq "$(PLATFORM)" "linux-gnu" # Settings for Linux using gcc compiler -PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1) - -# Default is linux on a intel machine +PROCTYPE := $(shell $(PRJ)/config.guess | cut -d "-" -f1 | sed -e 's/^i.86$$/i386/') PLATFORM=linux + +PACKAGE_LIB_DIR=linux_$(PROCTYPE).plt +UNOPKG_PLATFORM=Linux_$(PROCTYPE) +JAVA_PROC_TYPE=$(PROCTYPE) +STLPORT=no + +ifeq "$(PROCTYPE)" "i386" PACKAGE_LIB_DIR=linux_x86.plt UNOPKG_PLATFORM=Linux_x86 JAVA_PROC_TYPE=i386 - -ifeq "$(PROCTYPE)" "x86_64" -PACKAGE_LIB_DIR=linux_x86_64.plt -UNOPKG_PLATFORM=Linux_x86_64 -# needs deeper investigation for intel 64 bit -JAVA_PROC_TYPE=amd64 +STLPORT=yes endif ifeq "$(PROCTYPE)" "powerpc" PACKAGE_LIB_DIR=linux_powerpc.plt UNOPKG_PLATFORM=Linux_PowerPC JAVA_PROC_TYPE=ppc +STLPORT=yes endif ifeq "$(PROCTYPE)" "sparc" PACKAGE_LIB_DIR=linux_sparc.plt UNOPKG_PLATFORM=Linux_SPARC JAVA_PROC_TYPE=sparc +STLPORT=yes +endif + +ifeq "$(PROCTYPE)" "x86_64" +JAVA_PROC_TYPE=amd64 +endif + +ifeq "$(PROCTYPE)" "powerpc64" +JAVA_PROC_TYPE=ppc64 endif OS=LINUX @@ -289,11 +299,15 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore +ifeq "$(STLPORT)" "yes" ifeq "$(STLPORT_VER)" "500" STLPORTLIB=-lstlport else STLPORTLIB=-lstlport_gcc$(STLDEBUG) endif +else +STLPORTLIB= +endif EMPTYSTRING= PATH_SEPARATOR=: |