From f5fae0b774b7bb875dfff52a98949a567a510292 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sun, 14 Nov 2004 22:13:13 +0000 Subject: [PATCH] Use llvm-ar not ar for constructing archive. Wrap at 80 cols. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17784 91177308-0d34-0410-b5e6-96231b3b80d8 --- runtime/GCCLibraries/crtend/Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/runtime/GCCLibraries/crtend/Makefile b/runtime/GCCLibraries/crtend/Makefile index 4019735125c..34a69bf391b 100644 --- a/runtime/GCCLibraries/crtend/Makefile +++ b/runtime/GCCLibraries/crtend/Makefile @@ -39,6 +39,8 @@ $(bytecode_libdir)/libcrtend.a: $(CRTEND_A) $(bytecode_libdir) 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 @@ ComponentLibs := $(Components:%=$(ObjDir)/comp_%.bc) # 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 @@ SJLJEHObj := $(ObjDir)/SJLJ-Exception.bc # __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 $@