[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 597566b: * Makefile, mac/Makefile (LINK_CMD): D
From: |
Werner Lemberg |
Subject: |
[freetype2-demos] master 597566b: * Makefile, mac/Makefile (LINK_CMD): Don't hard-code `libtool`. |
Date: |
Wed, 24 Mar 2021 02:43:53 -0400 (EDT) |
branch: master
commit 597566b2301deeff4e9832aebdab1bf659a2accf
Author: orbea <orbea@riseup.net>
Commit: Werner Lemberg <wl@gnu.org>
* Makefile, mac/Makefile (LINK_CMD): Don't hard-code `libtool`.
---
ChangeLog | 4 ++++
Makefile | 3 +--
mac/Makefile | 3 +--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 57c145a..c08dd89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2021-03-24 orbea <orbea@riseup.net>
+ * Makefile, mac/Makefile (LINK_CMD): Don't hard-code `libtool`.
+
+2021-03-24 orbea <orbea@riseup.net>
+
[graph] Fix build with `slibtool`.
* graph/rules.mk (GRAPH_LIB): Handle the case specially where
diff --git a/Makefile b/Makefile
index 810142f..949402f 100644
--- a/Makefile
+++ b/Makefile
@@ -165,8 +165,7 @@ else
ifeq ($(PLATFORM),unix)
override CC = $(CCraw)
- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
- --mode=link $(CC) \
+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
$(subst /,$(COMPILER_SEP),$(LDFLAGS))
LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE))
$(LIB_CLOCK_GETTIME)
else
diff --git a/mac/Makefile b/mac/Makefile
index 73ae99c..52038a4 100644
--- a/mac/Makefile
+++ b/mac/Makefile
@@ -68,8 +68,7 @@ else
LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
CC = $(CCraw)
- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
- --mode=link $(CC) \
+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
$(subst /,$(COMPILER_SEP),$(LDFLAGS))
ifeq ($(findstring CoreServices,$(LDFLAGS)),)
LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 597566b: * Makefile, mac/Makefile (LINK_CMD): Don't hard-code `libtool`.,
Werner Lemberg <=