odk/settings/settings.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 4845fd13cb3dde2320df429c2660d95af0f5df64 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Sep 17 00:04:56 2014 +0200 Remove obsolete -malign-natural on Mac OS X from SDK, too ...causes "clang: error: unknown argument: '-malign-natural' [-Wunused-command-line-argument-hard-error-in-future]; clang: note: this will be a hard error (cannot be downgraded to a warning) in the future" at least with "Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn)", and last mention of -malign-natural in solenv/gbuild was removed with 4ea84822b1b638a61495af5006041bea8db8a3eb "OSX: drop -malign-natural flag for non-clang compilers." Change-Id: I0db1de484e45ba3eddf113392da71f20d099e9b5 diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 0377c57..0075142 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -434,8 +434,8 @@ OPT_FLAGS=-g else OPT_FLAGS=-O endif -CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) $(OPT_FLAGS) -CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden $(OPT_FLAGS) +CC_FLAGS_JNI=-c -fPIC -fno-common $(GCC_ARCH_OPTION) $(OPT_FLAGS) +CC_FLAGS=-c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden $(OPT_FLAGS) SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits