Skip to content

Commit

Permalink
Added new utility macro m4 file
Browse files Browse the repository at this point in the history
Added macro to detect usablity of gcc command args.
Now CFLAGS extra args, OPT_NORMAL and OPT_INLINE flags detected using this macro.
Moved the include and lib path resolver code into this utility class
Added x86_64 and x86 lib path into possible OpenCL lib paths (after we detect a 32 or 64 bit build)
Fixed --disable-openmp still showing openMP=yes on status.  Fixed sometimes blank GMP on status
  • Loading branch information
jfoug committed May 17, 2014
1 parent f8990ae commit 11f0390
Show file tree
Hide file tree
Showing 4 changed files with 1,530 additions and 433 deletions.
11 changes: 5 additions & 6 deletions src/Makefile.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is part of John the Ripper password cracker,
# Copyright (c) 1996-2013 by Solar Designer
# Copyright (c) 1996-2014 by Solar Designer
#
# ...with changes in the jumbo patch, by various authors
#
Expand All @@ -9,7 +9,7 @@
#
# There's ABSOLUTELY NO WARRANTY, express or implied.
#
# This file converted into autoconf format by Jim Fougeron and
# This file converted into autoconf format by JimF and
# magnum, in 2014. That is still a work in progress.
#

Expand Down Expand Up @@ -57,7 +57,7 @@ CCBIN_OSX = /usr/bin/llvm-gcc-4.2

# @CPU_BITS@ left out
CPPFLAGS += @CPPFLAGS@
CFLAGSX = -DAC_BUILT $(CPPFLAGS) -c -Wall -Wdeclaration-after-statement @CFLAGS@ @HAVE_NSS@ @NSS_CFLAGS@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ -fomit-frame-pointer -I/usr/local/include $(AMDAPP) $(RELEASE_BLD)
CFLAGSX = -DAC_BUILT $(CPPFLAGS) -c @CFLAGS@ @CFLAGS_EXTRA@ @HAVE_NSS@ @NSS_CFLAGS@ @OPENSSL_CFLAGS@ @OPENMP_CFLAGS@ @HAVE_MPI@ $(RELEASE_BLD)
# CFLAGS for use on the main john.c file only
CFLAGS_MAIN = @CC_MAIN_CPU@ $(CFLAGSX)
CFLAGS = @CC_CPU@ $(CFLAGSX)
Expand All @@ -66,9 +66,8 @@ LIBS = @LIBS@ @NSS_LIBS@ @OPENSSL_LIBS@
LDFLAGS = -g @LDFLAGS@ $(LIBS) @OPENMP_CFLAGS@ @HAVE_MPI@
LDFLAGS_MKV = -g @OPENMP_CFLAGS@
#
OPT_NORMAL = -funroll-loops
# Remove the "-Os" if you're using an ancient version of gcc
OPT_INLINE = -Os -funroll-loops -finline-functions
OPT_NORMAL = @OPT_NORMAL_FLAGS@
OPT_INLINE = @OPT_INLINE_FLAGS@
#

PLUGFORMATS_SRCS = @PLUGFORMATS_SRCS@
Expand Down
Loading

0 comments on commit 11f0390

Please sign in to comment.