You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2012/02/01 00:01:44 UTC
svn commit: r1238850 - in /incubator/mesos/trunk: configure.ac
src/Makefile.am
Author: benh
Date: Tue Jan 31 23:01:43 2012
New Revision: 1238850
URL: http://svn.apache.org/viewvc?rev=1238850&view=rev
Log:
Added a --disable-optimize flag to remove trying to compile with optimizations.
Modified:
incubator/mesos/trunk/configure.ac
incubator/mesos/trunk/src/Makefile.am
Modified: incubator/mesos/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.ac?rev=1238850&r1=1238849&r2=1238850&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.ac (original)
+++ incubator/mesos/trunk/configure.ac Tue Jan 31 23:01:43 2012
@@ -39,7 +39,7 @@ LT_INIT
LT_LANG([C++])
LT_OUTPUT
-# The default CFLAGS/CXXFLAGS from autoconf when using gcd is usually
+# The default CFLAGS/CXXFLAGS from autoconf when using gcc is usually
# "-g -O2". These really slow down compiling our tests, so we turn
# them off and enable them (where desired) directly in the
# Makefile. Note that this should not have an impact on users setting
@@ -91,6 +91,11 @@ AC_ARG_ENABLE([webui],
[don't build webui (requires Python 2.6)]),
[], [enable_webui=yes])
+AC_ARG_ENABLE([optimize],
+ AS_HELP_STRING([--disable-optimize],
+ [don't try to compile with optimizations]),
+ [], [enable_optimize=yes])
+
AC_ARG_WITH([included-zookeeper],
AS_HELP_STRING([--without-included-zookeeper],
[excludes building and using the included ZooKeeper
@@ -338,6 +343,15 @@ fi
AM_CONDITIONAL([WEBUI], [test "x$webui" = "xyes"])
+# Check if we should try and enable optimizations.
+if test "x$enable_optimize" = "xyes"; then
+ # For now, we only turn on optimizations for gcc.
+ if test "x$GCC" = "xyes"; then
+ CXXFLAGS="$CXXFLAGS -g2 -O2"
+ fi
+fi
+
+
# Configure the included ZooKeeper if necessary, if not consider
# checking the installed ZooKeeper version.
if test "x$with_included_zookeeper" = "xyes"; then
Modified: incubator/mesos/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.am?rev=1238850&r1=1238849&r2=1238850&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.am (original)
+++ incubator/mesos/trunk/src/Makefile.am Tue Jan 31 23:01:43 2012
@@ -72,7 +72,7 @@ PHONY_TARGETS =
AM_CXXFLAGS = $(PTHREAD_CFLAGS)
AM_LIBS = $(PTHREAD_LIBS)
-# Setup CPPFLAGS and CXXFLAGS that are used for most source files.
+# Setup CPPFLAGS that are used for most source files.
MESOS_CPPFLAGS = $(AM_CPPFLAGS)
MESOS_CPPFLAGS += -DMESOS_WEBUI_DIR=\"$(webuidir)\"
MESOS_CPPFLAGS += -DMESOS_LIBEXECDIR=\"$(pkglibexecdir)\"
@@ -88,8 +88,6 @@ if WITH_INCLUDED_ZOOKEEPER
MESOS_CPPFLAGS += -I$(top_srcdir)/$(ZOOKEEPER)/generated
endif
-MESOS_CXXFLAGS = -g2 -O2 $(AM_CXXFLAGS)
-
# README: we build the Mesos library out of a collection of
# convenience libraries (that is, libraries that do not get installed
@@ -205,8 +203,6 @@ libmesos_no_third_party_la_SOURCES += co
libmesos_no_third_party_la_CPPFLAGS = $(MESOS_CPPFLAGS)
-libmesos_no_third_party_la_CXXFLAGS = $(MESOS_CXXFLAGS)
-
libmesos_no_third_party_la_LIBADD = # Initialized to allow += below.
# Convenience library that *always* gets rebuilt to ensure accurate info.
@@ -217,7 +213,11 @@ libbuild_la_CPPFLAGS += -DBUILD_DATE="\"
libbuild_la_CPPFLAGS += -DBUILD_USER="\"$$USER\""
# We need to escape the build flags properly.
-BUILD_FLAGS=$(echo $(MESOS_CPPFLAGS) | sed 's/\"/\\\"/g') $(MESOS_CXXFLAGS)
+BUILD_FLAGS = $(echo $(MESOS_CPPFLAGS) $(CPPFLAGS) | sed 's/\"/\\\"/g') \
+ $(echo $(AM_CFLAGS) $(CFLAGS) | sed 's/\"/\\\"/g') \
+ $(echo $(AM_CXXFLAGS) $(CXXFLAGS) | sed 's/\"/\\\"/g')
+
+# TODO(benh): Provide other build flags such as WEBUI_FLAGS, etc.
libbuild_la_CPPFLAGS += -DBUILD_FLAGS="\"$$BUILD_FLAGS\""
@@ -232,7 +232,6 @@ noinst_LTLIBRARIES += liblog.la
liblog_la_SOURCES = log/coordinator.cpp log/replica.cpp
nodist_liblog_la_SOURCES = $(LOG_PROTOS)
liblog_la_CPPFLAGS = -I../$(LEVELDB)/include $(MESOS_CPPFLAGS)
-liblog_la_CXXFLAGS = $(MESOS_CXXFLAGS)
liblog_la_LDFLAGS = -L../$(LEVELDB)
liblog_la_LIBADD = -lleveldb
@@ -245,7 +244,6 @@ noinst_LTLIBRARIES += libwebui.la
libwebui_la_SOURCES = master/webui.cpp slave/webui.cpp common/webui_utils.cpp
libwebui_la_SOURCES += master/webui.hpp slave/webui.hpp common/webui_utils.hpp
libwebui_la_CPPFLAGS = $(MESOS_CPPFLAGS) $(WEBUI_CPPFLAGS)
-libwebui_la_CXXFLAGS = $(MESOS_CXXFLAGS)
libwebui_la_LIBADD = $(WEBUI_LDFLAGS)
endif
@@ -281,44 +279,37 @@ endif
sbin_PROGRAMS += mesos-master
mesos_master_SOURCES = master/main.cpp
mesos_master_CPPFLAGS = $(MESOS_CPPFLAGS)
-mesos_master_CXXFLAGS = $(MESOS_CXXFLAGS)
mesos_master_LDADD = libwebui.la libmesos.la
sbin_PROGRAMS += mesos-slave
mesos_slave_SOURCES = slave/main.cpp
mesos_slave_CPPFLAGS = $(MESOS_CPPFLAGS)
-mesos_slave_CXXFLAGS = $(MESOS_CXXFLAGS)
mesos_slave_LDADD = libwebui.la libmesos.la
bin_PROGRAMS += mesos-local
mesos_local_SOURCES = local/main.cpp
mesos_local_CPPFLAGS = $(MESOS_CPPFLAGS)
-mesos_local_CXXFLAGS = $(MESOS_CXXFLAGS)
mesos_local_LDADD = libmesos.la
pkglibexec_PROGRAMS += mesos-launcher
mesos_launcher_SOURCES = launcher/main.cpp launcher/launcher.cpp
mesos_launcher_CPPFLAGS = $(MESOS_CPPFLAGS)
-mesos_launcher_CXXFLAGS = $(MESOS_CXXFLAGS)
mesos_launcher_LDADD = libmesos.la
bin_PROGRAMS += mesos-log
mesos_log_SOURCES = log/main.cpp
mesos_log_CPPFLAGS = $(MESOS_CPPFLAGS)
-mesos_log_CXXFLAGS = $(MESOS_CXXFLAGS)
mesos_log_LDADD = libmesos.la
# TODO(benh): Support Solaris.
# bin_PROGRAMS += mesos-projd
# mesos_projd_SOURCES = slave/projd.cpp
# mesos_projd_CPPFLAGS = $(MESOS_CPPFLAGS)
-# mesos_projd_CXXFLAGS = $(MESOS_CXXFLAGS)
# mesos_projd_LDADD = libmesos.la
bin_PROGRAMS += mesos-mesos
mesos_mesos_SOURCES = mesos/main.cpp
mesos_mesos_CPPFLAGS = $(MESOS_CPPFLAGS)
-mesos_mesos_CXXFLAGS = $(MESOS_CXXFLAGS)
mesos_mesos_LDADD = libmesos.la
@@ -423,8 +414,6 @@ libjava_la_CPPFLAGS = $(MESOS_CPPFLAGS)
libjava_la_CPPFLAGS += $(JAVA_CPPFLAGS)
libjava_la_CPPFLAGS += -I$(srcdir)/java/jni -Ijava/jni
-libjava_la_CXXFLAGS = $(MESOS_CXXFLAGS)
-
libjava_la_DEPENDENCIES = $(MESOS_PROTO)
libjava_la_LIBADD = $(JAVA_LDFLAGS)
@@ -613,8 +602,6 @@ mesos_tests_CPPFLAGS += -DBUILD_DIR=\"$(
mesos_tests_CPPFLAGS += -I$(top_srcdir)/$(GTEST)/include
mesos_tests_CPPFLAGS += -I$(top_srcdir)/$(GMOCK)/include
-mesos_tests_CXXFLAGS = -g2 -O0 $(AM_CXXFLAGS)
-
mesos_tests_LDADD = ../.libs/libgmock.la libmesos.la
mesos_tests_DEPENDENCIES = # Initialized to allow += below.