[vmkit-commits] [vmkit] r180380 - use my rule to build executables

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:03:29 2013
New Revision: 180380

URL: http://llvm.org/viewvc/llvm-project?rev=180380&view=rev
Log:
use my rule to build executables
(cherry picked from commit dc345342ab1333151e78c67257bff2c6af6fd596)

Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180380&r1=180379&r2=180380&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:03:29 2013
@@ -1,17 +1,10 @@
-VMJC      := $(ToolDir)/vmjc$(EXEEXT)
-
-$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
-	$(Echo) '**[30] Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)'
-	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
 
-$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir
-	$(Echo) "**[20] Linking $(BuildMode) $(SharedLibKindMessage) $(notdir $@)"
-	$(Verb) $(CLANGXX) -O0 -o $@ $(SHOPT) -Wl,-R -Wl,'$ORIGIN' -shared $(ObjectsO)
-
-$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMToolDir)/llvm-ar
-	$(Echo) "**[22] Building $(BuildMode) Bytecode Archive $(notdir $@)"
-	$(Verb) $(RM) -f $@
-	$(Verb) $(LArchive) $@ $(ObjectsBC)
+#
+#
+# OLD BUILD SYSTEM
+#
+#
+VMJC      := $(ToolDir)/vmjc$(EXEEXT)
 
 # Set the LLVM build file location 
 LLVMBuildTool   := $(LLVM_SRC_ROOT)/utils/llvm-build/llvm-build
@@ -182,11 +175,14 @@ $(VMKIT_OPENJDK_ZIP): $(addprefix $(PROJ
 
 endif
 
-# NEW BUILD SYSTEM
-#                                                                                                                                          
-# global variables                                                                                                                         
-#                                                                                                                                          
 
+
+
+#
+#
+#   NEW BUILD SYSTEM
+#
+#
 LLVM_BIN=`$(LLVM_CONFIG) --bindir`
 
 CLANGXX=$(LLVM_BIN)/clang++
@@ -205,7 +201,24 @@ INCLUDES+=-I. -I$(PROJ_SRC_ROOT)/include
 WARN_CFLAGS=  -Wall -Wno-long-long -Wno-variadic-macros -Wno-unused-private-field -Wno-unused-variable
 COMMON_CFLAGS+=  -O0 $(INCLUDES) -fno-strict-aliasing -fno-omit-frame-pointer  -ansi -pedantic $(WARN_CFLAGS)
 
+CFLAGS+=$(COMMON_CFLAGS) `$(LLVM_CONFIG) --cflgas`
 CXXFLAGS+=$(COMMON_CFLAGS) `$(LLVM_CONFIG) --cxxflags`
+MY_LDFLAGS+=`$(LLVM_CONFIG) --ldflags` $(LDOPT)
+MY_LIBS+=`$(LLVM_CONFIG) --libs`
+
+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
+	$(Echo) '**[30] Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)'
+#	$(Verb) $(CLANGXX) $(LDFLAGS) -O0 -o $@ $^ $(LIBS)
+	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
+
+$(LibName.SO): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(SharedLibDir)/.dir
+	$(Echo) "**[20] Linking $(BuildMode) $(SharedLibKindMessage) $(notdir $@)"
+	$(Verb) $(CLANGXX) -O0 -o $@ $(SHOPT) -Wl,-R -Wl,'$ORIGIN' -shared $(ObjectsO)
+
+$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMToolDir)/llvm-ar
+	$(Echo) "**[22] Building $(BuildMode) Bytecode Archive $(notdir $@)"
+	$(Verb) $(RM) -f $@
+	$(Verb) $(LArchive) $@ $(ObjectsBC)
 
 $(ObjectsBC): $(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "**[1] Compiling $*.cpp for $(BuildMode) build (bytecode)"
@@ -218,4 +231,3 @@ $(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(B
 $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(PROJ_MAKEFILE)
 	$(Echo) "**[3] Compiling $*.cpp for $(BuildMode) build" $(PIC_FLAG)
 	$(Verb) $(CLANGXX) $(CXXFLAGS) -c "$<" -o $@
-