octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-23 11:28:56 +00:00
Code Issues Releases Wiki Activity

Specify tag with libtool

Browse Source 
This solves
  libtool: compile: unable to infer tagged configuration
  libtool:   error: specify a tag with '--tag'
build issues when using toolchain that prevents libtools
inference rules from working correctly (e.g. ccache).
This commit is contained in:
Daniel Wagenknecht 2021-05-28 10:46:18 +02:00 committed by Jay Berkenbilt
parent df38fe8e48
commit b8e5484647
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make/libtool.mk
View File

@ -60,7 +60,7 @@ endef
# 1 2 # 1 2
# Usage: $(call libcompile,src,includes) # Usage: $(call libcompile,src,includes)
define libcompile define libcompile
$(LIBTOOL) --quiet --mode=compile \ $(LIBTOOL) --quiet --mode=compile --tag=CXX \
$(CXX) $(CXXFLAGS) \ $(CXX) $(CXXFLAGS) \
$(call libdepflags,$(basename $(call src_to_obj,$(1)))) \ $(call libdepflags,$(basename $(call src_to_obj,$(1)))) \
$(foreach I,$(2),-I$(I)) \ $(foreach I,$(2),-I$(I)) \
@ -72,7 +72,7 @@ endef
# 1 2 # 1 2
# Usage: $(call libcompile,src,includes) # Usage: $(call libcompile,src,includes)
define c_libcompile define c_libcompile
$(LIBTOOL) --quiet --mode=compile \ $(LIBTOOL) --quiet --mode=compile --tag=CC \
$(CC) $(CFLAGS) \ $(CC) $(CFLAGS) \
$(call libdepflags,$(basename $(call c_src_to_obj,$(1)))) \ $(call libdepflags,$(basename $(call c_src_to_obj,$(1)))) \
$(foreach I,$(2),-I$(I)) \ $(foreach I,$(2),-I$(I)) \
@ -92,7 +92,7 @@ endef
# 1 2 3 4 5 6 7 # 1 2 3 4 5 6 7
# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age) # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
define makelib define makelib
$(LIBTOOL) --mode=link \ $(LIBTOOL) --mode=link --tag=CXX \
$(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \ $(CXX) $(CXXFLAGS) $(LD_VERSION_FLAGS) \
-o $(2) $(1) $(3) $(4) \ -o $(2) $(1) $(3) $(4) \
$(RPATH) -version-info $(5):$(6):$(7) -no-undefined $(RPATH) -version-info $(5):$(6):$(7) -no-undefined
@ -101,7 +101,8 @@ endef
# 1 2 3 4 5 # 1 2 3 4 5
# Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags) # Usage: $(call makebin,objs,binary,ldflags,libs,xlinkflags)
define makebin define makebin
$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(5) $(1) -o $(2) $(3) $(4) $(LIBTOOL) --mode=link --tag=CXX \
$(CXX) $(CXXFLAGS) $(5) $(1) -o $(2) $(3) $(4)
endef endef
# Install target # Install target