diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2015-10-12 12:38:51 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-10-12 12:58:27 +0000 |
| commit | cd49f0f80c015703b8ff92a62c0079cf3410b381 (patch) | |
| tree | d005704c3acf1da749bd7de933664a1593531a4a /odk | |
| parent | 7a1c0ad333073fcf2a90779f31ac0c75b1598c4e (diff) | |
Kill dead mac os x 32bit odk build config
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>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/settings/settings.mk | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 554ac74b2ab2..b5bee39e0a56 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 |