Skip to content

Commit 5b9d5bf

Browse files
committed
depends: remove (darwin) libtool now that it's no longer used
Note that this is completely unrelated to gnu usage of libtool.
1 parent 3ef6563 commit 5b9d5bf

File tree

5 files changed

+2
-6
lines changed

5 files changed

+2
-6
lines changed

depends/builders/darwin.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ darwin_CXX:=$(shell xcrun -f clang++) -stdlib=libc++ -isysroot$(shell xcrun --sh
1616
darwin_AR:=$(shell xcrun -f ar)
1717
darwin_RANLIB:=$(shell xcrun -f ranlib)
1818
darwin_STRIP:=$(shell xcrun -f strip)
19-
darwin_LIBTOOL:=$(shell xcrun -f libtool)
2019
darwin_OTOOL:=$(shell xcrun -f otool)
2120
darwin_NM:=$(shell xcrun -f nm)
2221
darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)

depends/funcs.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ $(1)_objc=$$($$($(1)_type)_OBJC)
66
$(1)_objcxx=$$($$($(1)_type)_OBJCXX)
77
$(1)_ar=$$($$($(1)_type)_AR)
88
$(1)_ranlib=$$($$($(1)_type)_RANLIB)
9-
$(1)_libtool=$$($$($(1)_type)_LIBTOOL)
109
$(1)_nm=$$($$($(1)_type)_NM)
1110
$(1)_cflags=$$($$($(1)_type)_CFLAGS) \
1211
$$($$($(1)_type)_$$(release_type)_CFLAGS)

depends/hosts/darwin.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ llvm_config_prog=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-config")
3939
llvm_lib_dir=$(shell $(llvm_config_prog) --libdir)
4040
endif
4141

42-
cctools_TOOLS=AR RANLIB STRIP NM LIBTOOL OTOOL INSTALL_NAME_TOOL DSYMUTIL
42+
cctools_TOOLS=AR RANLIB STRIP NM OTOOL INSTALL_NAME_TOOL DSYMUTIL
4343

4444
# Make-only lowercase function
4545
lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))

depends/hosts/default.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ default_host_CXX = $(host_toolchain)g++
77
default_host_AR = $(host_toolchain)ar
88
default_host_RANLIB = $(host_toolchain)ranlib
99
default_host_STRIP = $(host_toolchain)strip
10-
default_host_LIBTOOL = $(host_toolchain)libtool
1110
default_host_NM = $(host_toolchain)nm
1211
default_host_OBJCOPY = $(host_toolchain)objcopy
1312

@@ -39,5 +38,5 @@ host_$1 = $$($(host_arch)_$(host_os)_$1)
3938
host_$(release_type)_$1 = $$($(host_arch)_$(host_os)_$(release_type)_$1)
4039
endef
4140

42-
$(foreach tool,CC CXX AR RANLIB STRIP LIBTOOL NM OBJCOPY OTOOL INSTALL_NAME_TOOL DSYMUTIL,$(eval $(call add_host_tool_func,$(tool))))
41+
$(foreach tool,CC CXX AR RANLIB STRIP NM OBJCOPY OTOOL INSTALL_NAME_TOOL DSYMUTIL,$(eval $(call add_host_tool_func,$(tool))))
4342
$(foreach flags,CFLAGS CXXFLAGS CPPFLAGS LDFLAGS, $(eval $(call add_host_flags_func,$(flags))))

depends/packages.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ These variables may be set to override or append their default values.
7474
$(package)_objcxx
7575
$(package)_ar
7676
$(package)_ranlib
77-
$(package)_libtool
7877
$(package)_nm
7978
$(package)_cflags
8079
$(package)_cxxflags

0 commit comments

Comments
 (0)