Partly revert "Build: more Solaris cc/ld workaround attempts"

Partly reverts commit a449ff8.

Hard-coding "ld" when cross-compiling is a bad idea.

Author: bkuhls

src/src/miscmods/Makefile

@@ -48,22 +48,10 @@ spf_perl.o spf_perl.so:		$(HDRS) spf.h spf_perl.c
 
 
 
-# We need a single .o because that's what scripts/Configure-Makefile
-# understands and fills in to $(OBJ).
-# Try desparately to get the Solaris cc/ld to build one.
-#dkim.o:
-#	@echo "$(CC) dkim.c dkim_transport.c pdkim.c signing.c"
-#	$(FE)$(CC) -r $(LDFLAGS_PARTIAL) -o $@ $(CFLAGS) $(INCLUDE) \
-#		dkim.c dkim_transport.c pdkim.c signing.c
 dkim.o:
 	@echo "$(CC) dkim.c dkim_transport.c pdkim.c signing.c"
-	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) dkim.c
-	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) dkim_transport.c
-	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) pdkim.c
-	$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $(TLS_INCLUDE) signing.c
-	$(FE)mv dkim.o dkim_tmp.o
-	$(FE)ld -r -o dkim.o $(LDFLAGS_PARTIAL) \
-		dkim_tmp.o dkim_transport.o pdkim.o signing.o
+	$(FE)$(CC) -r $(LDFLAGS_PARTIAL) -o $@ $(CFLAGS) $(INCLUDE) \
+		$(TLS_INCLUDE) dkim.c dkim_transport.c pdkim.c signing.c
 
 # Similarly, we want a single .so for the dynamic-load module
 dkim.so: