strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kill dead mac os x 32bit odk build config

Browse source 
Change-Id: I6e35709a399aa520c9ad198c39a5fb03f3500c9c
Reviewed-on: https://gerrit.libreoffice.org/19320
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Riccardo Magliocchetti 2015-10-12 12:38:51 +02:00 committed by Norbert Thiebaud
parent 7a1c0ad333
commit cd49f0f80c
1 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
odk/settings/settings.mk
View file

@ -355,36 +355,16 @@ endif
#
###########################################################################
ifeq "$(PLATFORM)" "macosx"
# Settings for MacOSX using gcc 4.0.1 compiler
ifeq "$(PROCTYPE)" "x86"
UNOPKG_PLATFORM=MacOSX_x86
else
ifeq "$(PROCTYPE)" "x86_64"
UNOPKG_PLATFORM=MacOSX_x86_64
endif
endif
JAVABIN=Commands
ifeq "$(PROCTYPE)" "x86"
GCC_VERSION =$(shell gcc -dumpversion| cut -d"." -f1,2)
ifeq "$(GCC_VERSION)" "4.2"
GCC_ARCH_OPTION=-arch i386
endif
endif
OS=MACOSX
PS=/
ICL=\$$
ifeq "$(PROCTYPE)" "x86"
CC=gcc-$(GCC_VERSION)
LINK=g++-$(GCC_VERSION)
LIB=g++-$(GCC_VERSION)
else
CC=clang++
LINK=clang++
LIB=clang++
endif
ECHO=@echo
MKDIR=mkdir -p
CAT=cat