Skip to content

Commit a47de39

Browse files
committed
Fix cross-compile by adding LD variable
Fixes cross-build error due to commit a449ff8. Hard-coding "ld" when cross-compiling is a bad idea.
1 parent fc38fe8 commit a47de39

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/OS/Makefile-Base

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ dynmodules: buildlookups buildrouters buildtransports buildauths \
10651065
buildlookups: config
10661066
@cd lookups && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
10671067
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" HDRS="../version.h $(PHDRS)" \
1068-
FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \
1068+
FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" \
10691069
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) $(LOOKUP_INCLUDE)"
10701070
@echo " "
10711071

@@ -1074,7 +1074,7 @@ buildlookups: config
10741074
buildrouters: config
10751075
@cd routers && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
10761076
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
1077-
FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
1077+
FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
10781078
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
10791079
@echo " "
10801080

@@ -1083,7 +1083,7 @@ buildrouters: config
10831083
buildtransports: config
10841084
@cd transports && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
10851085
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
1086-
FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
1086+
FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
10871087
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
10881088
@echo " "
10891089

@@ -1092,7 +1092,7 @@ buildtransports: config
10921092
buildauths: config
10931093
@cd auths && $(MAKE) SHELL=$(SHELL) AR="$(AR)" $(MFLAGS) CC="$(CC)" CFLAGS="$(CFLAGS)" \
10941094
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
1095-
FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
1095+
FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" HDRS="$(PHDRS)" \
10961096
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE)"
10971097
@echo " "
10981098

@@ -1101,7 +1101,7 @@ buildmisc: config
11011101
CC="$(CC)" CFLAGS="$(CFLAGS)" \
11021102
CFLAGS_DYNAMIC="$(CFLAGS_DYNAMIC)" \
11031103
LDFLAGS_PARTIAL="$(LDFLAGS_PARTIAL)" HDRS="../version.h $(PHDRS)" \
1104-
FE="$(FE)" RANLIB="$(RANLIB)" RM_COMMAND="$(RM_COMMAND)" \
1104+
FE="$(FE)" RANLIB="$(RANLIB)" LD="$(LD)" RM_COMMAND="$(RM_COMMAND)" \
11051105
PERL_CC="$(PERL_CC)" PERL_CCOPTS="$(PERL_CCOPTS)" \
11061106
PERL_CFLAGS="$(PERL_CFLAGS)" PERL_LFLAGS="$(PERL_LFLAGS)" \
11071107
INCLUDE="$(INCLUDE) $(IPV6_INCLUDE)" TLS_INCLUDE="$(TLS_INCLUDE)"

src/OS/Makefile-Default

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ HOSTNAME_COMMAND=/bin/hostname
227227

228228
RANLIB=ranlib
229229

230+
LD=ld
230231

231232
# EXIM_CHMOD is available to specify a command that is automatically applied
232233
# to the Exim binary immediately it is compiled. (I find this useful when

src/src/miscmods/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dkim.o:
6262
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) pdkim.c
6363
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) signing.c
6464
$(FE)mv dkim.o dkim_tmp.o
65-
$(FE)ld -r -o dkim.o $(LDFLAGS_PARTIAL) \
65+
$(FE)$(LD) -r -o dkim.o $(LDFLAGS_PARTIAL) \
6666
dkim_tmp.o dkim_transport.o pdkim.o signing.o
6767

6868
# Similarly, we want a single .so for the dynamic-load module

0 commit comments

Comments
 (0)