Propagate a few more variables to Makefile.shared when linking

programs.

1 files changed, 62 insertions, 31 deletions

diff --git a/test/Makefile.ssl b/test/Makefile.ssl
index f3a7b58f4c..29b467edca 100644
--- a/test/Makefile.ssl
+++ b/test/Makefile.ssl
@@ -327,7 +327,8 @@ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(RSATEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(RSATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(RSATEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -343,7 +344,8 @@ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(BNTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(BNTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(BNTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -359,7 +361,8 @@ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(ECTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(ECTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(ECTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -375,7 +378,8 @@ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(EXPTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(EXPTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(EXPTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -391,7 +395,8 @@ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(IDEATEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(IDEATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(IDEATEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -407,7 +412,8 @@ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(MD2TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(MD2TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(MD2TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -423,7 +429,8 @@ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(SHATEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(SHATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(SHATEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -439,7 +446,8 @@ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(SHA1TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(SHA1TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(SHA1TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -455,7 +463,8 @@ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(SHA256TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(SHA256TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(SHA256TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -471,7 +480,8 @@ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(SHA512TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(SHA512TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(SHA512TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -487,7 +497,8 @@ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(RMDTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(RMDTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(RMDTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -503,7 +514,8 @@ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(MDC2TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(MDC2TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(MDC2TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -519,7 +531,8 @@ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(MD4TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(MD4TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(MD4TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -535,7 +548,8 @@ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(MD5TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(MD5TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(MD5TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -551,7 +565,8 @@ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(HMACTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(HMACTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(HMACTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -567,7 +582,8 @@ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(RC2TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(RC2TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(RC2TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -583,7 +599,8 @@ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(BFTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(BFTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(BFTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -599,7 +616,8 @@ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(CASTTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(CASTTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(CASTTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -615,7 +633,8 @@ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(RC4TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(RC4TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(RC4TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -631,7 +650,8 @@ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(RC5TEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(RC5TEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(RC5TEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -647,7 +667,8 @@ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(DESTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(DESTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(DESTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -663,7 +684,8 @@ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(RANDTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(RANDTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(RANDTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -679,7 +701,8 @@ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(DHTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(DHTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(DHTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -695,7 +718,8 @@ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(DSATEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(DSATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(DSATEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -711,7 +735,8 @@ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(METHTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(METHTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(METHTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -727,7 +752,8 @@ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(SSLTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(SSLTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(SSLTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -743,7 +769,8 @@ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(ENGINETEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(ENGINETEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(ENGINETEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -759,7 +786,8 @@ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(EVPTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(EVPTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(EVPTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -775,7 +803,8 @@ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(ECDSATEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(ECDSATEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(ECDSATEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -791,7 +820,8 @@ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=$(ECDHTEST)$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=$(ECDHTEST)$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="$(ECDHTEST).o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \
@@ -817,7 +847,8 @@ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
 	  LIBRARIES="$(LIBCRYPTO)"; \
 	fi; \
 	$(NEWMAKE) -f $(TOP)/Makefile.shared \
-		APPNAME=dummytest$(EXE_EXT) LDFLAGS="$(CFLAGS)" \
+		APPNAME=dummytest$(EXE_EXT) CC="$(CC)" LDFLAGS="$(CFLAGS)" \
+		SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
 		OBJECTS="dummytest.o" \
 		LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
 		LIBRPATH=$(INSTALLTOP)/lib \