Author: evancheng
Date: Fri Jan 18 15:01:00 2008
New Revision: 46180
URL: http://llvm.org/viewvc/llvm-project?rev=46180&view=rev
Log:
Fix makefiles to enable Apply style debug build.
Modified:
llvm/trunk/utils/buildit/GNUmakefile
llvm/trunk/utils/buildit/build_llvm
Modified: llvm/trunk/utils/buildit/GNUmakefile
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/GNUmakefile?rev=46180&r1=46179&r2=46180&view=diff
==============================================================================
--- llvm/trunk/utils/buildit/GNUmakefile (original)
+++ llvm/trunk/utils/buildit/GNUmakefile Fri Jan 18 15:01:00 2008
@@ -41,6 +41,13 @@
LLVM_ASSERTIONS := no
endif
+# Default is optimized build.
+ifeq ($(LLVM_DEBUG),1)
+LLVM_OPTIMIZED := no
+else
+LLVM_OPTIMIZED := yes
+endif
+
ifndef RC_ProjectSourceVersion
RC_ProjectSourceVersion = 9999
endif
@@ -54,7 +61,7 @@
$(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
$(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
$(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) \
- $(LLVM_ASSERTIONS)
+ $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED)
# installhdrs does nothing, because the headers aren't useful until
# the compiler is installed.
Modified: llvm/trunk/utils/buildit/build_llvm
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=46180&r1=46179&r2=46180&view=diff
==============================================================================
--- llvm/trunk/utils/buildit/build_llvm (original)
+++ llvm/trunk/utils/buildit/build_llvm Fri Jan 18 15:01:00 2008
@@ -44,6 +44,10 @@
# enabled in the LLVM libs/tools.
LLVM_ASSERTIONS="$9"
+# The tenth parameter is a yes/no that indicates whether this is an optimized
+# build.
+LLVM_OPTIMIZED="${10}"
+
# The current working directory is where the build will happen. It may already
# contain a partial result of an interrupted build, in which case this script
# will continue where it left off.
@@ -55,19 +59,6 @@
# If the user has CC set in their environment unset it now
unset CC
-# The B&I build srcript (~rc/bin/buildit) accepts an '-othercflags'
command-line
-# flag, and captures the argument to that flag in $RC_NONARCH_CFLAGS (and
-# mysteriously prepends '-pipe' thereto). We will allow this to override the
-# default $CFLAGS and $CXXFLAGS.
-
-if [ "x$LLVM_DEBUG" == "x" ]; then
- CFLAGS="-g -O2 ${RC_NONARCH_CFLAGS/-pipe/}"
- OPTIMIZE_OPTS="ENABLE_OPTIMIZED=1"
-else
- CFLAGS="-g"
- OPTIMIZE_OPTS=
-fi
-
################################################################################
# Run the build.
@@ -85,7 +76,9 @@
if [ \! -f Makefile.config ]; then
$SRC_DIR/llvm/configure --prefix=$DEST_DIR$DEST_ROOT \
- --enable-targets=x86,powerpc,cbe --enable-assertions=$LLVM_ASSERTIONS \
+ --enable-targets=x86,powerpc,cbe \
+ --enable-assertions=$LLVM_ASSERTIONS \
+ --enable-optimized=$LLVM_OPTIMIZED \
|| exit 1
fi
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
