Skip to content

Commit da10142

Browse files
committed
remove temporary .so file as it requires more symlinks
1 parent c0b00bf commit da10142

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

Makefile.pre.in

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -662,22 +662,22 @@ LIBEXPAT_HEADERS= \
662662
LIBHACL_MD5_OBJS= \
663663
Modules/_hacl/Hacl_Hash_MD5.o
664664
LIBHACL_MD5_LIB_STATIC=Modules/_hacl/libHacl_Hash_MD5.a
665-
LIBHACL_MD5_LIB_SHARED=Modules/_hacl/libHacl_Hash_MD5$(SHLIB_SUFFIX)
665+
LIBHACL_MD5_LIB_SHARED=$(LIBHACL_MD5_OBJS)
666666

667667
LIBHACL_SHA1_OBJS= \
668668
Modules/_hacl/Hacl_Hash_SHA1.o
669669
LIBHACL_SHA1_LIB_STATIC=Modules/_hacl/libHacl_Hash_SHA1.a
670-
LIBHACL_SHA1_LIB_SHARED=Modules/_hacl/libHacl_Hash_SHA1$(SHLIB_SUFFIX)
670+
LIBHACL_SHA1_LIB_SHARED=$(LIBHACL_SHA1_OBJS)
671671

672672
LIBHACL_SHA2_OBJS= \
673673
Modules/_hacl/Hacl_Hash_SHA2.o
674674
LIBHACL_SHA2_LIB_STATIC=Modules/_hacl/libHacl_Hash_SHA2.a
675-
LIBHACL_SHA2_LIB_SHARED=Modules/_hacl/libHacl_Hash_SHA2$(SHLIB_SUFFIX)
675+
LIBHACL_SHA2_LIB_SHARED=$(LIBHACL_SHA2_OBJS)
676676

677677
LIBHACL_SHA3_OBJS= \
678678
Modules/_hacl/Hacl_Hash_SHA3.o
679679
LIBHACL_SHA3_LIB_STATIC=Modules/_hacl/libHacl_Hash_SHA3.a
680-
LIBHACL_SHA3_LIB_SHARED=Modules/_hacl/libHacl_Hash_SHA3$(SHLIB_SUFFIX)
680+
LIBHACL_SHA3_LIB_SHARED=$(LIBHACL_SHA3_OBJS)
681681

682682
LIBHACL_BLAKE2_SIMD128_OBJS=@LIBHACL_BLAKE2_SIMD128_OBJS@
683683
LIBHACL_BLAKE2_SIMD256_OBJS=@LIBHACL_BLAKE2_SIMD256_OBJS@
@@ -688,7 +688,7 @@ LIBHACL_BLAKE2_OBJS= \
688688
$(LIBHACL_BLAKE2_SIMD128_OBJS) \
689689
$(LIBHACL_BLAKE2_SIMD256_OBJS)
690690
LIBHACL_BLAKE2_LIB_STATIC=Modules/_hacl/libHacl_Hash_BLAKE2.a
691-
LIBHACL_BLAKE2_LIB_SHARED=Modules/_hacl/libHacl_Hash_BLAKE2$(SHLIB_SUFFIX)
691+
LIBHACL_BLAKE2_LIB_SHARED=$(LIBHACL_BLAKE2_OBJS)
692692

693693
LIBHACL_HMAC_OBJS= \
694694
Modules/_hacl/Hacl_HMAC.o \
@@ -699,7 +699,7 @@ LIBHACL_HMAC_OBJS= \
699699
$(LIBHACL_SHA3_OBJS) \
700700
$(LIBHACL_BLAKE2_OBJS)
701701
LIBHACL_HMAC_LIB_STATIC=Modules/_hacl/libHacl_HMAC.a
702-
LIBHACL_HMAC_LIB_SHARED=Modules/_hacl/libHacl_HMAC$(SHLIB_SUFFIX)
702+
LIBHACL_HMAC_LIB_SHARED=$(LIBHACL_HMAC_OBJS)
703703

704704
LIBHACL_HEADERS= \
705705
Modules/_hacl/include/krml/FStar_UInt128_Verified.h \
@@ -1492,36 +1492,24 @@ Modules/_hacl/Hacl_Hash_MD5.o: $(srcdir)/Modules/_hacl/Hacl_Hash_MD5.c $(LIBHACL
14921492
$(LIBHACL_MD5_LIB_STATIC): $(LIBHACL_MD5_OBJS)
14931493
-rm -f $@
14941494
$(AR) $(ARFLAGS) $@ $(LIBHACL_MD5_OBJS)
1495-
$(LIBHACL_MD5_LIB_SHARED): $(LIBHACL_MD5_OBJS)
1496-
-rm -f $@
1497-
$(LDSHARED) $(LIBHACL_LDFLAGS) $(LIBHACL_MD5_OBJS) -o $@
14981495

14991496
Modules/_hacl/Hacl_Hash_SHA1.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c $(LIBHACL_SHA1_HEADERS)
15001497
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA1.c
15011498
$(LIBHACL_SHA1_LIB_STATIC): $(LIBHACL_SHA1_OBJS)
15021499
-rm -f $@
15031500
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA1_OBJS)
1504-
$(LIBHACL_SHA1_LIB_SHARED): $(LIBHACL_SHA1_OBJS)
1505-
-rm -f $@
1506-
$(LDSHARED) $(LIBHACL_LDFLAGS) $(LIBHACL_SHA1_OBJS) -o $@
15071501

15081502
Modules/_hacl/Hacl_Hash_SHA2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c $(LIBHACL_SHA2_HEADERS)
15091503
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA2.c
15101504
$(LIBHACL_SHA2_LIB_STATIC): $(LIBHACL_SHA2_OBJS)
15111505
-rm -f $@
15121506
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA2_OBJS)
1513-
$(LIBHACL_SHA2_LIB_SHARED): $(LIBHACL_SHA2_OBJS)
1514-
-rm -f $@
1515-
$(LDSHARED) $(LIBHACL_LDFLAGS) $(LIBHACL_SHA2_OBJS) -o $@
15161507

15171508
Modules/_hacl/Hacl_Hash_SHA3.o: $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c $(LIBHACL_SHA3_HEADERS)
15181509
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_SHA3.c
15191510
$(LIBHACL_SHA3_LIB_STATIC): $(LIBHACL_SHA3_OBJS)
15201511
-rm -f $@
15211512
$(AR) $(ARFLAGS) $@ $(LIBHACL_SHA3_OBJS)
1522-
$(LIBHACL_SHA3_LIB_SHARED): $(LIBHACL_SHA3_OBJS)
1523-
-rm -f $@
1524-
$(LDSHARED) $(LIBHACL_LDFLAGS) $(LIBHACL_SHA3_OBJS) -o $@
15251513

15261514
Modules/_hacl/Hacl_Hash_Blake2s.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c $(LIBHACL_BLAKE2_HEADERS)
15271515
$(CC) -c $(LIBHACL_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2s.c
@@ -1535,13 +1523,9 @@ Modules/_hacl/Hacl_Hash_Blake2b_Simd256.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Bla
15351523
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_BLAKE2_SIMD256_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256.c
15361524
Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.o: $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c $(LIBHACL_BLAKE2_HEADERS)
15371525
$(CC) -c $(LIBHACL_CFLAGS) $(LIBHACL_BLAKE2_SIMD256_CFLAGS) -o $@ $(srcdir)/Modules/_hacl/Hacl_Hash_Blake2b_Simd256_universal2.c
1538-
15391526
$(LIBHACL_BLAKE2_LIB_STATIC): $(LIBHACL_BLAKE2_OBJS)
15401527
-rm -f $@
15411528
$(AR) $(ARFLAGS) $@ $(LIBHACL_BLAKE2_OBJS)
1542-
$(LIBHACL_BLAKE2_LIB_SHARED): $(LIBHACL_BLAKE2_OBJS)
1543-
-rm -f $@
1544-
$(LDSHARED) $(LIBHACL_LDFLAGS) $(LIBHACL_BLAKE2_OBJS) -o $@
15451529

15461530
# Other HACL* cryptographic primitives
15471531

@@ -1552,9 +1536,6 @@ Modules/_hacl/Hacl_Streaming_HMAC.o: $(srcdir)/Modules/_hacl/Hacl_Streaming_HMAC
15521536
$(LIBHACL_HMAC_LIB_STATIC): $(LIBHACL_HMAC_OBJS)
15531537
-rm -f $@
15541538
$(AR) $(ARFLAGS) $@ $(LIBHACL_HMAC_OBJS)
1555-
$(LIBHACL_HMAC_LIB_SHARED): $(LIBHACL_HMAC_OBJS)
1556-
-rm -f $@
1557-
$(LDSHARED) $(LIBHACL_LDFLAGS) $(LIBHACL_HMAC_OBJS) -o $@
15581539

15591540
##########################################################################
15601541
# create relative links from build/lib.platform/egg.so to Modules/egg.so

0 commit comments

Comments
 (0)