solenv/gbuild/platform/macosx.mk | 2 +-
solenv/inc/unxmacx.mk | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit c29b6b2a065bbf7ade2d6b62dfd1c0245318f355
Author: Tor Lillqvist <t...@iki.fi>
Date: Sun Apr 22 22:44:08 2012 +0300
No -malign-natural in Clang, not Apple's at least
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index d4d113d..819fbef 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -75,7 +75,7 @@ gb_CXXFLAGS := \
-Wno-non-virtual-dtor \
-fno-strict-aliasing \
-fsigned-char \
- -malign-natural \
+ $(if $(filter TRUE,$(COM_GCC_IS_CLANG)),,-malign-natural) \
#-Wshadow \ break in compiler headers already
#-fsigned-char \ might be removed?
#-malign-natural \ might be removed?
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 1ca6a82..1a7c891 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -88,7 +88,7 @@ CC*=gcc
objc*=$(CC)
objcpp*=$(CXX)
-CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS)
+CFLAGS=-fsigned-char -fmessage-length=0 -c $(EXTRA_CFLAGS)
.IF "$(DISABLE_DEPRECATION_WARNING)" == "TRUE"
CFLAGS+=-Wno-deprecated-declarations
@@ -97,7 +97,10 @@ CFLAGS+=-Wno-deprecated-declarations
# Compilation flags
# ---------------------------------
# Normal C compilation flags
-CFLAGSCC=-pipe -fsigned-char -malign-natural $(ARCH_FLAGS)
+CFLAGSCC=-pipe -fsigned-char $(ARCH_FLAGS)
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSCC+=-malign-natural
+.ENDIF
# Normal Objective C compilation flags
#OBJCFLAGS=-no-precomp
@@ -117,7 +120,10 @@ CFLAGSEXCEPTIONS+=-fno-enforce-eh-specs
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
# Normal C++ compilation flags
-CFLAGSCXX=-pipe -malign-natural -fsigned-char $(ARCH_FLAGS)
-Wno-ctor-dtor-privacy
+CFLAGSCXX=-pipe -fsigned-char $(ARCH_FLAGS) -Wno-ctor-dtor-privacy
+.IF "$(COM_GCC_IS_CLANG)" != "TRUE"
+CFLAGSCXX+=-malign-natural
+.ENDIF
.IF "$(HAVE_GCC_NO_LONG-DOUBLE)" == "TRUE"
CFLAGSCXX+= -Wno-long-double
.ENDIF
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
