diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-10-04 07:05:07 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-10-04 07:05:07 +0000 |
| commit | 37130d2b5edab108b05a29cd71b7476ff0bed172 (patch) | |
| tree | 1d0878aa7cd741674982aab6d490d31954dc532d /Makefile.rules | |
| parent | ac6a47588b22e7ea4d5ba6a3335c7a5a471cbf85 (diff) | |
| download | llvm-37130d2b5edab108b05a29cd71b7476ff0bed172.tar.gz llvm-37130d2b5edab108b05a29cd71b7476ff0bed172.tar.bz2 llvm-37130d2b5edab108b05a29cd71b7476ff0bed172.tar.xz | |
Provide support for auto-detection and use of compression libraries.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16643 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Makefile.rules b/Makefile.rules index 76b00ae17f..adf5ef9f79 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -463,8 +463,8 @@ $(sysconfdir): $(MKDIR) $(sysconfdir) install-config-files: $(sysconfdir) $(CONFIG_FILES) - $(VERB) echo Installing Configuration Files To $(sysconfdir) - $(VERB) for file in $(CONFIG_FILES); do \ + $(VERB)$(ECHO) Installing Configuration Files To $(sysconfdir) + $(VERB)for file in $(CONFIG_FILES); do \ $(INSTALL) $(SourceDir)/$${file} $(sysconfdir) ; \ done endif @@ -527,7 +527,7 @@ install-bytecode-library:: $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc: $(LIBNAME_BC) $(DESTDIR)$(bytecode_libdir) @${ECHO} ======= Installing $(LIBRARYNAME) bytecode library ======= - cp $< $@ + $(VERB)cp $< $@ # Does the library want a .o version built? ifndef DONT_BUILD_RELINKED @@ -593,7 +593,7 @@ install-dynamic-library: $(LIBNAME_CUR) # $(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir @${ECHO} Linking $(LIBRARYNAME) archive release library - @$(RM) -f $@ + $(VERB)$(RM) -f $@ $(VERB) $(Link) -03 -o $@ $(ObjectsO) $(LibSubDirs) -static @${ECHO} Finished building $(LIBRARYNAME) archive release library ======= @@ -656,6 +656,13 @@ endif # ifdef TOOLNAME +# Handle compression libraries automatically +ifeq ($(HAVE_BZIP2),1) +USEDLIBS += bz2.a +endif +ifeq ($(HAVE_ZLIB),1) +USEDLIBS += z.a +endif # TOOLEXENAME* - These compute the output filenames to generate... TOOLEXENAME_G := $(DESTTOOLDEBUG)/$(TOOLNAME) TOOLEXENAME_O := $(DESTTOOLRELEASE)/$(TOOLNAME) @@ -728,8 +735,9 @@ $(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(LLVM_LIB_PATHS_P) $(DESTTOOL @${ECHO} ======= Finished building $(TOOLNAME) profile executable ======= install:: $(TOOLEXENAMES) - $(MKDIR) $(DESTDIR)$(bindir) - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME) + @${ECHO} Installing $(TOOLEXENAMES) to $(DESTDIR)$(bindir) + $(VERB)$(MKDIR) $(DESTDIR)$(bindir) + $(VERB)$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME) endif |