[Libreoffice-commits] core.git: odk/settings

[Riccardo Magliocchetti]

 odk/settings/settings.mk |   20 --------------------
 1 file changed, 20 deletions(-)

New commits:
commit cd49f0f80c015703b8ff92a62c0079cf3410b381
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon Oct 12 12:38:51 2015 +0200

    Kill dead mac os x 32bit odk build config
    
    Change-Id: I6e35709a399aa520c9ad198c39a5fb03f3500c9c
    Reviewed-on: https://gerrit.libreoffice.org/19320
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 554ac74..b5bee39 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -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