Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs
Commits:
-
597566b2
by orbea at 2021-03-24T07:43:07+01:00
3 changed files:
Changes:
| 1 |
+2021-03-24 orbea <orbea@riseup.net>
|
|
| 2 |
+ |
|
| 3 |
+ * Makefile, mac/Makefile (LINK_CMD): Don't hard-code `libtool`.
|
|
| 4 |
+ |
|
| 1 | 5 |
2021-03-24 orbea <orbea@riseup.net>
|
| 2 | 6 |
|
| 3 | 7 |
[graph] Fix build with `slibtool`.
|
| ... | ... | @@ -165,8 +165,7 @@ else |
| 165 | 165 |
|
| 166 | 166 |
ifeq ($(PLATFORM),unix)
|
| 167 | 167 |
override CC = $(CCraw)
|
| 168 |
- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
|
|
| 169 |
- --mode=link $(CC) \
|
|
| 168 |
+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
|
|
| 170 | 169 |
$(subst /,$(COMPILER_SEP),$(LDFLAGS))
|
| 171 | 170 |
LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(LIB_CLOCK_GETTIME)
|
| 172 | 171 |
else
|
| ... | ... | @@ -68,8 +68,7 @@ else |
| 68 | 68 |
LINK_ITEMS = $T$(subst /,$(COMPILER_SEP),$@ $<)
|
| 69 | 69 |
|
| 70 | 70 |
CC = $(CCraw)
|
| 71 |
- LINK_CMD = $(subst /,$(SEP),$(OBJ_BUILD)/libtool) \
|
|
| 72 |
- --mode=link $(CC) \
|
|
| 71 |
+ LINK_CMD = $(LIBTOOL) --mode=link $(CC) \
|
|
| 73 | 72 |
$(subst /,$(COMPILER_SEP),$(LDFLAGS))
|
| 74 | 73 |
ifeq ($(findstring CoreServices,$(LDFLAGS)),)
|
| 75 | 74 |
LINK_LIBS = $(subst /,$(COMPILER_SEP),$(FTLIB) $(EFENCE)) $(MATH) \
|