diff options
| author | J08nY | 2024-08-12 18:21:02 +0200 |
|---|---|---|
| committer | J08nY | 2024-08-12 18:39:40 +0200 |
| commit | bac37f1e676d0f01bcf03679fc58365db5bf2329 (patch) | |
| tree | 6fded572f681c3af7e01190340ed4aa9597137b0 | |
| parent | 86528d63ad31c1845cd37855ec799682ea2598f9 (diff) | |
| download | ECTester-bac37f1e676d0f01bcf03679fc58365db5bf2329.tar.gz ECTester-bac37f1e676d0f01bcf03679fc58365db5bf2329.tar.zst ECTester-bac37f1e676d0f01bcf03679fc58365db5bf2329.zip | |
Cleanup passing of CFLAGS and LFLAGS to shims.
| -rw-r--r-- | nix/boringsslshim.nix | 2 | ||||
| -rw-r--r-- | nix/ippcpshim.nix | 4 | ||||
| -rw-r--r-- | standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/Makefile | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nix/boringsslshim.nix b/nix/boringsslshim.nix index a5e7fbd..715e721 100644 --- a/nix/boringsslshim.nix +++ b/nix/boringsslshim.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { make boringssl ''; - BORINGSSL_CFLAGS = "${boringssl.dev.outPath}/include"; + BORINGSSL_CFLAGS = "-I${boringssl.dev.outPath}/include"; installPhase = '' mkdir --parents $out/lib diff --git a/nix/ippcpshim.nix b/nix/ippcpshim.nix index 2b1d676..349817b 100644 --- a/nix/ippcpshim.nix +++ b/nix/ippcpshim.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { jdk11_headless ]; - IPP_CRYPTO_HEADER = "${ipp-crypto.dev}/include"; - IPP_CRYPTO_LIB = "${ipp-crypto}/lib/"; + IPP_CRYPTO_CFLAGS = "-I${ipp-crypto.dev}/include"; + IPP_CRYPTO_LFLAGS = "-L${ipp-crypto}/lib/"; buildPhase = '' make ippcp 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 |