[llvm-commits] CVS: llvm/runtime/GCCLibraries/crtend/Makefile

[Reid Spencer]

Changes in directory llvm/runtime/GCCLibraries/crtend:

Makefile updated: 1.19 -> 1.20
---
Log message:

Use llvm-ar not ar for constructing archive. Wrap at 80 cols.

---
Diffs of the changes:  (+12 -4)

Index: llvm/runtime/GCCLibraries/crtend/Makefile
diff -u llvm/runtime/GCCLibraries/crtend/Makefile:1.19 llvm/runtime/GCCLibraries/crtend/Makefile:1.20
--- llvm/runtime/GCCLibraries/crtend/Makefile:1.19	Sat Oct 30 04:19:36 2004
+++ llvm/runtime/GCCLibraries/crtend/Makefile	Sun Nov 14 16:13:13 2004
@@ -39,6 +39,8 @@
 install:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
 install-bytecode:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
 
+clean-local::
+	$(Verb)$(RM) -f $(CRTEND_A)
 
 # The three components described in the README
 Components := main genericeh sjljeh
@@ -48,7 +50,7 @@
 # We build libcrtend.a from the four components described in the README.
 $(CRTEND_A) : $(ComponentLibs) $(LibDir)/.dir
 	$(Echo) Building final libcrtend.a file from components
-	$(Verb) $(Archive) $@ $(ComponentLibs)
+	$(Verb) $(LArchive) $@ $(ComponentLibs)
 
 MainObj      := $(ObjDir)/crtend.bc $(ObjDir)/listend.bc
 GenericEHObj := $(ObjDir)/Exception.bc
@@ -57,14 +59,20 @@
 # __main and ctor/dtor support component
 $(ObjDir)/comp_main.bc: $(MainObj)
 	$(Echo) Linking $(notdir $@) component...
-	$(Verb) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_main.lst $(MainObj) -o $@
+	$(Verb) $(GCCLD) -link-as-library \
+	-internalize-public-api-file=$(BUILD_SRC_DIR)/comp_main.lst \
+	$(MainObj) -o $@ \
 
 # Generic exception handling support runtime.
 $(ObjDir)/comp_genericeh.bc: $(GenericEHObj)
 	$(Echo) Linking $(notdir $@) component...
-	$(Verb) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_genericeh.lst $(GenericEHObj) -o $@
+	$(Verb) $(GCCLD) -link-as-library \
+	-internalize-public-api-file=$(BUILD_SRC_DIR)/comp_genericeh.lst \
+	$(GenericEHObj) -o $@
 
 # setjmp/longjmp exception handling support runtime.
 $(ObjDir)/comp_sjljeh.bc: $(SJLJEHObj)
 	$(Echo) Linking $(notdir $@) component...
-	$(Verb) $(GCCLD) -link-as-library -internalize-public-api-file=$(BUILD_SRC_DIR)/comp_sjljeh.lst $(SJLJEHObj) -o $@
+	$(Verb) $(GCCLD) -link-as-library \
+	-internalize-public-api-file=$(BUILD_SRC_DIR)/comp_sjljeh.lst \
+	$(SJLJEHObj) -o $@