From 841985fecd64252b395558f0cc5b5a44065e3808 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Sat, 6 Jul 2019 22:04:09 +0000 Subject: [PATCH] move tls object file into crypto directory --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b06d168..aad20b6 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,7 @@ crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \ #/usr/musl/bin/musl-clang -Wall -Wextra -Wno-missing-braces -Werror -Wno-pointer-sign -I. -DTFM_DESC -DTFM_NO_ASM -I ../libtomcrypt/src/headers -I ../tomsfastmath/src/headers -DSTRICT_TLS -DIGNORE_SESSION_ID --rtlib=compiler-rt -c -o tlse.o tlse.c -tls.o: $(addprefix crypto/, $(TLSOBJ)) +crypto/tls.o: $(addprefix crypto/, $(TLSOBJ)) ld -o $@ -r $+ TFMOBJ= \ @@ -356,6 +356,7 @@ TFMOBJ= \ sqr/fp_sqrmod.o tomsfastmath/src/addsub/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4 + tomsfastmath/src/%.o: CFLAGS+=-DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers -DARGTYPE=4 tfm.o: $(addprefix tomsfastmath/src/, $(TFMOBJ)) @@ -783,7 +784,7 @@ rfc3986: rfc3986.c src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign -bin/zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o +bin/zpm-fetchurl: ltc.o crypto/tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o $(CC) $(CFLAGS) -static -o $@ $+ testddg: zpm-fetchurl -- 2.40.0