[llvm-branch-commits] [cfe-branch] r109128 - in /cfe/branches/Apple/whitney-IB: ClangBNI.mk Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Thu Jul 22 13:13:16 2010
New Revision: 109128

URL: http://llvm.org/viewvc/llvm-project?rev=109128&view=rev
Log:
Don't build the stage1 compiler with debug info, it just bloats the executable.
 - Also, sprinkle in some time commands.

Modified:
    cfe/branches/Apple/whitney-IB/ClangBNI.mk
    cfe/branches/Apple/whitney-IB/Makefile

Modified: cfe/branches/Apple/whitney-IB/ClangBNI.mk
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/ClangBNI.mk?rev=109128&r1=109127&r2=109128&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/whitney-IB/ClangBNI.mk Thu Jul 22 13:13:16 2010
@@ -179,15 +179,19 @@
 Clang_Make_Variables += LLVM_LTO_VERSION_OFFSET=3000
 
 # Set configure flags.
-Configure_Flags = --enable-targets=$(LLVM_Backends) \
+Common_Configure_Flags = \
+		  --enable-targets=$(LLVM_Backends) \
 		  --enable-optimized \
 		  --disable-timestamps \
 		  $(Assertions_Configure_Flag) \
                   --with-optimize-option="$(Clang_Optimize_Option)" \
-                  --with-extra-options="$(Clang_Extra_Options)" \
 		  --without-llvmgcc --without-llvmgxx \
 		  --disable-bindings \
 		  --disable-doxygen
+Stage1_Configure_Flags = $(Common_Configure_Flags) \
+                  --with-extra-options="$(Clang_Extra_Options)"
+Configure_Flags = $(Common_Configure_Flags) \
+                  --with-extra-options="$(Clang_Extra_Options) $(Clang_Final_Extra_Options)"
 
 # Set up any additional Clang install targets.
 Extra_Clang_Install_Targets :=
@@ -374,13 +378,13 @@
 build-clang_final: configure-clang_final
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Building (Final) for $$arch..." && \
-		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/$$arch $(Build_Target) || exit 1; \
+		time $(MAKE) -j$(SYSCTL) -C $(OBJROOT)/$$arch $(Build_Target) || exit 1; \
 	done
 
 build-clang_stage1: configure-clang_stage1
 	$(_v) echo "Building (Stage 1) for $(Stage1_Compiler_Arch)..."
-	$(_v) $(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$(Stage1_Compiler_Arch) $(Build_Target_Stage1)
-	$(_v) $(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$(Stage1_Compiler_Arch) $(Install_Target_Stage1)
+	$(_v) time $(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$(Stage1_Compiler_Arch) $(Build_Target_Stage1)
+	$(_v) time $(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$(Stage1_Compiler_Arch) $(Install_Target_Stage1)
 
 configure-clang_final: $(Final_Configure_Target)
 
@@ -390,7 +394,7 @@
 		echo "Configuring (Final) for $$arch..." && \
 		$(MKDIR) $(OBJROOT)/$$arch && \
 		cd $(OBJROOT)/$$arch && \
-		$(Configure) --prefix="$(Install_Prefix)" $(Configure_Flags) \
+		time $(Configure) --prefix="$(Install_Prefix)" $(Configure_Flags) \
 		  CC="$(OBJROOT)/stage1-install-$(Stage1_Compiler_Arch)/bin/clang -arch $$arch" \
 		  CXX="$(OBJROOT)/stage1-install-$(Stage1_Compiler_Arch)/bin/clang++ -arch $$arch" || exit 1 ; \
 	done
@@ -401,7 +405,7 @@
 		echo "Configuring (Final) for $$arch..." && \
 		$(MKDIR) $(OBJROOT)/$$arch && \
 		cd $(OBJROOT)/$$arch && \
-		$(Configure) --prefix="$(Install_Prefix)" $(Configure_Flags) \
+		time $(Configure) --prefix="$(Install_Prefix)" $(Configure_Flags) \
 		  CC="$(CC) -arch $$arch" \
 		  CXX="$(CXX) -arch $$arch" || exit 1 ; \
 	done
@@ -411,7 +415,7 @@
 	$(_v) echo "Configuring (Stage 1) for $(Stage1_Compiler_Arch)..."
 	$(_v) $(MKDIR) $(OBJROOT)/stage1-$(Stage1_Compiler_Arch)
 	$(_v) cd $(OBJROOT)/stage1-$(Stage1_Compiler_Arch) && \
-	      $(Configure) --prefix="$(OBJROOT)/stage1-install-$(Stage1_Compiler_Arch)" $(Configure_Flags) \
+	      time $(Configure) --prefix="$(OBJROOT)/stage1-install-$(Stage1_Compiler_Arch)" $(Stage1_Configure_Flags) \
 	        CC="$(CC) -arch $(Stage1_Compiler_Arch)" CXX="$(CXX) -arch $(Stage1_Compiler_Arch)" || exit 1
 
 install-clang-rootlinks: install-clang_final

Modified: cfe/branches/Apple/whitney-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/Makefile?rev=109128&r1=109127&r2=109128&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/Makefile (original)
+++ cfe/branches/Apple/whitney-IB/Makefile Thu Jul 22 13:13:16 2010
@@ -11,7 +11,9 @@
 # Select optimization flags to use.
 Clang_Optimize_Option  := -O2
 # Additional arbitrary compiler options.
-Clang_Extra_Options    := -g -DDISABLE_SMART_POINTERS
+Clang_Extra_Options    := -DDISABLE_SMART_POINTERS
+# Additional arbitrary compiler options, only passed to final configure stage.
+Clang_Final_Extra_Options := -g
 # Enable use of clang++?
 Clang_Enable_CXX       := 1
 # Build all LLVM tools; not just clang?