From bac37f1e676d0f01bcf03679fc58365db5bf2329 Mon Sep 17 00:00:00 2001
From: J08nY
Date: Mon, 12 Aug 2024 18:21:02 +0200
Subject: Cleanup passing of CFLAGS and LFLAGS to shims.

---
 .../main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'standalone/src')

diff --git a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
index baa8635..7c02a1f 100644
--- a/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
+++ b/standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile
@@ -117,7 +117,7 @@ boringssl_provider.so: boringssl.o c_utils.o | clibs
 	$(CC) $(CFLAGS) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L. -Wl,-Bstatic -l:lib_boringssl.a -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so
 
 boringssl.o: boringssl.c
-	$(CC) -I$(BORINGSSL_CFLAGS) $(CFLAGS) -c $<
+	$(CC) $(BORINGSSL_CFLAGS) $(CFLAGS) -c $<
 
 
 # libgcrypt shim
@@ -178,10 +178,10 @@ mbedtls.o: mbedtls.c
 ippcp: ippcp_provider.so
 
 ippcp_provider.so: ippcp.o c_utils.o | clibs
-	$(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ -L$(IPP_CRYPTO_LIB) -Wl,-Bstatic -l:libippcp.a -L. -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so
+	$(CC) $(LFLAGS) -o $@ -Wl,-rpath,'$$ORIGIN/lib' $^ $(IPP_CRYPTO_LFLAGS) -Wl,-Bstatic -l:libippcp.a -L. -Wl,-Bdynamic -l:lib_timing.so -l:lib_csignals.so
 
 ippcp.o: ippcp.c
-	$(CC) -I$(IPP_CRYPTO_HEADER) $(CFLAGS) -c $<
+	$(CC) $(IPP_CRYPTO_CFLAGS) $(CFLAGS) -c $<
 
 
 # Nettle shim
-- 
cgit v1.2.3-70-g09d2