RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-11-25 12:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Allow date command to be printed in verbose mode

Browse Source 
* Get rid of appending -lbz2 and -lz to ExtraLibs now that we don't need
  them any more.
* Fix the dist-check target so that EXTRA_DIST can be defined AFTER the
  include of Makefile.common. This is needed because Makefile.common
  provides variable definitions that may need to be used in computing the
  value of EXTRA_DIST.
* Clean up some "distdir" target output.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18329 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-11-29 05:00:33 +00:00
parent 513b9213fd
commit fbbf307b15
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile.rules
View File

@ -341,7 +341,7 @@ $(sysconfdir):
# To create other directories, as needed, and timestamp their creation
%/.dir:
$(Verb) $(MKDIR) $* > /dev/null
@$(DATE) > $@
$(Verb) $(DATE) > $@
.PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(ExmplDir)/.dir
.PRECIOUS: $(LLVMLibDir)/.dir $(LLVMToolDir)/.dir $(LLVMExmplDir)/.dir
@ -635,17 +635,6 @@ LLVMUsedLibs := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(LLVMLIBS)))
ProjLibsPaths := $(addprefix $(LibDir)/,$(ProjUsedLibs))
LLVMLibsPaths := $(addprefix $(LLVMLibDir)/,$(LLVMUsedLibs))
#---------------------------------------------------------
# Handle optional compression libraries automatically
#---------------------------------------------------------
ExtraLibs := $(LIBS)
ifeq ($(HAVE_BZIP2),1)
ExtraLibs += -lbz2
endif
ifeq ($(HAVE_ZLIB),1)
ExtraLibs += -lz
endif
#---------------------------------------------------------
# Tell make that we need to rebuild subdirectories before
# we can link the tool. This affects things like LLI which
@ -1003,9 +992,9 @@ DistOther := $(notdir $(wildcard \
$(BUILD_SRC_DIR)/*.def \
$(BUILD_SRC_DIR)/*.ll \
$(BUILD_SRC_DIR)/*.in))
DistSources := $(Sources) $(EXTRA_DIST)
DistSubDirs := $(SubDirs)
DistFiles := $(DistAlways) $(DistSources) $(DistOther)
DistSources = $(Sources) $(EXTRA_DIST)
DistFiles = $(DistAlways) $(DistSources) $(DistOther)
#------------------------------------------------------------------------
# We MUST build distribution with OBJ_DIR != SRC_DIR
@ -1044,13 +1033,15 @@ dist-gzip:: $(DistTarGZip)
$(DistTarGZip) : distdir
$(Echo) Packing gzipped distribution tar file.
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | gzip -c > "$(DistTarGZip)"
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | \
$(GZIP) -c > "$(DistTarGZip)"
dist-bzip2:: $(DistTarBZ2)
$(DistTarBZ2) : distdir
$(Echo) Packing bzipped distribution tar file.
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | $(BZIP2) -c >$(DistTarBZ2)
$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | \
$(BZIP2) -c >$(DistTarBZ2)
dist-zip:: $(DistZip)
@ -1095,7 +1086,6 @@ endif
# Provide the recursive distdir target for building the distribution directory
#------------------------------------------------------------------------
distdir : $(DistSources)
$(Echo) Building Distribution Directory $(DistDir)
$(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
if test -d "$(DistDir)" ; then \
find $(DistDir) -type d ! -perm -200 -exec chmod u+w {} ';' || \
@ -1104,6 +1094,7 @@ distdir : $(DistSources)
$(EchoCmd) Removing $(DistDir) ; \
$(RM) -rf $(DistDir); \
fi
$(Echo) Building Distribution Directory $(DistDir)
$(Verb) $(MKDIR) $(DistDir)
$(Verb) srcdirstrip=`echo "$(BUILD_SRC_DIR)" | sed 's|.|.|g'`; \
srcrootstrip=`echo "$(BUILD_SRC_ROOT)" | sed 's|.|.|g'`; \