>From 406f3d5bacaee893c61779219fe1dfa15d02c6f1 Mon Sep 17 00:00:00 2001 From: Frank Dittrich Date: Mon, 25 Jun 2012 11:30:22 +0200 Subject: [PATCH] Fix clang make targets for the HAVE_NSS case --- src/Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 36a9d66..8fe96c9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -398,7 +398,7 @@ linux-x86-64-clang: @echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86-64.o sse-intrinsics.o" \ - CFLAGS="-c -O2 -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL" \ + CFLAGS="-c -O2 -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL $(HAVE_NSS)" \ LDFLAGS="-lm -lssl -lcrypto -lcrypt -ldl" \ CPP="clang" CC="clang" AS="clang" LD="clang" @@ -407,7 +407,7 @@ linux-x86-64-clang-debug: @echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86-64.o sse-intrinsics.o" \ - CFLAGS="-c -g -O1 -faddress-sanitizer -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL" \ + CFLAGS="-c -g -O1 -faddress-sanitizer -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL $(HAVE_NSS)" \ LDFLAGS="-lm -lssl -lcrypto -lcrypt -ldl -lz -faddress-sanitizer" \ CPP="clang" CC="clang" AS="clang" LD="clang" @@ -570,7 +570,7 @@ linux-x86-clang: @echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o x86-sse.o sha1-mmx.o md4-mmx.o md5-mmx.o sse-intrinsics.o" \ - CFLAGS="-c -O2 -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL" \ + CFLAGS="-c -O2 -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL $(HAVE_NSS)" \ LDFLAGS="-lm -lssl -lcrypto -lcrypt -ldl -lz" \ CPP="clang" CC="clang" AS="clang" LD="clang" @@ -579,7 +579,7 @@ linux-x86-clang-debug: @echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o x86-sse.o sha1-mmx.o md4-mmx.o md5-mmx.o sse-intrinsics.o" \ - CFLAGS="-c -g -O1 -faddress-sanitizer -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL" \ + CFLAGS="-c -g -O1 -faddress-sanitizer -I/usr/include -msse2 -DHAVE_CRYPT -DHAVE_DL $(HAVE_NSS)" \ LDFLAGS="-lm -lssl -lcrypto -lcrypt -ldl -lz -faddress-sanitizer" \ CPP="clang" CC="clang" AS="clang" LD="clang" -- 1.7.7.6