blob: 40784f9b26982c48872f9e5c3dd53420e24023ab (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From 46d58e2b03e15a863aed8661b9ee922da4930a3e Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Mon, 30 May 2022 11:57:07 -0400
Subject: [PATCH 4/5] Inherit toolchain vars from environment
---
mk/syslinux.mk | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/mk/syslinux.mk b/mk/syslinux.mk
index 593ff75f..91d984e8 100644
--- a/mk/syslinux.mk
+++ b/mk/syslinux.mk
@@ -37,7 +37,7 @@ ifdef DEBUG
DEBUGOPT = -DDEBUG=$(DEBUG)
endif
-NASM = nasm
+NASM ?= nasm
NASMOPT = -Ox $(DEBUGOPT)
PERL = perl
@@ -46,29 +46,29 @@ UPX = upx
CHMOD = chmod
-CC = gcc
+CC ?= gcc
gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \
if $(CC) $(GCCOPT) $(1) -c $(topdir)/dummy.c \
-o $$tmpf 2>/dev/null ; \
then echo '$(1)'; else echo '$(2)'; fi; \
rm -f $$tmpf)
-LD = ld
-OBJDUMP = objdump
-OBJCOPY = objcopy
-STRIP = strip
-AR = ar
-NM = nm
-RANLIB = ranlib
-STRIP = strip
-GZIPPROG = gzip
-XZ = xz
-PNGTOPNM = pngtopnm
-MCOPY = mcopy
-MFORMAT = mformat
-MKISOFS = mkisofs
-SED = sed
-WGET = wget
+LD ?= ld
+OBJDUMP ?= objdump
+OBJCOPY ?= objcopy
+STRIP ?= strip
+AR ?= ar
+NM ?= nm
+RANLIB ?= ranlib
+STRIP ?= strip
+GZIPPROG ?= gzip
+XZ ?= xz
+PNGTOPNM ?= pngtopnm
+MCOPY ?= mcopy
+MFORMAT ?= mformat
+MKISOFS ?= mkisofs
+SED ?= sed
+WGET ?= wget
com32 = $(topdir)/com32
--
2.35.1
|
