Author: damjan
Date: Wed Jan 25 04:02:55 2017
New Revision: 1780134
URL: http://svn.apache.org/viewvc?rev=1780134&view=rev
Log:
Fix a FreeBSD regression in the gbuild gb_CPUDEFS variable caused by
r1773166, where it was always set to POWERPC64 due to a swapped if-else.
This needs further work, on all platforms!
Patch by: me
Modified:
openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
Modified: openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk?rev=1780134&r1=1780133&r2=1780134&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk Wed Jan 25 04:02:55
2017
@@ -68,14 +68,10 @@ gb_COMPILERDEFS := \
ifeq ($(CPUNAME),X86_64)
gb_CPUDEFS := -D$(CPUNAME)
-else
-gb_CPUDEFS := -DX86
-endif
-
-ifeq ($(CPUNAME),POWERPC64)
+else ifeq ($(CPUNAME),POWERPC64)
gb_CPUDEFS := -D$(CPUNAME)
else
-gb_CPUDEFS := -DPOWERPC64
+gb_CPUDEFS := -DX86
endif
gb_CFLAGS := \
