Build on MacOS.

diff --git a/GitConfigure b/GitConfigure
index bbab33ebc59dd07900d9c245d8d3a67c282927b1..0821031afabfb6f25c497611b8767ff6e561d67c 100755 (executable)
--- a/GitConfigure
+++ b/GitConfigure
@@ -5,4 +5,6 @@ BRANCH=`git rev-parse --abbrev-ref HEAD`
 ./Configure $@ no-symlinks
 make files
 util/mk1mf.pl OUT=out.$BRANCH TMP=tmp.$BRANCH INC=inc.$BRANCH copy > makefile.$BRANCH
-make -f makefile.$BRANCH init
+MAKE=make
+which bsdmake > /dev/null && MAKE=bsdmake
+$MAKE -f makefile.$BRANCH init

diff --git a/GitMake b/GitMake
index 47beffd6bc1f70408f28ce4d50d3c0b4a5853a70..db300045bbfd796884c42a9c7616517f23b4450d 100755 (executable)
--- a/GitMake
+++ b/GitMake
@@ -2,4 +2,6 @@
 
 BRANCH=`git rev-parse --abbrev-ref HEAD`
 
-make -f makefile.$BRANCH $@
+MAKE=make
+which bsdmake > /dev/null && MAKE=bsdmake
+$MAKE -f makefile.$BRANCH $@

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2b383e2339937a6dd207d5e9e4e6882f07ceb6a4..94691df98a1a03b3503962704ad13971ba67826a 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/env perl
 # A bit of an evil hack but it post processes the file ../MINFO which
 # is generated by `make files` in the top directory.
 # This script outputs one mega makefile that has no shell stuff or any
@@ -669,7 +669,7 @@ RANLIB=$ranlib
 MKDIR=$mkdir
 MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
-ASM=$bin_dir$asm
+#ASM=$bin_dir$asm
 
 # FIPS validated module and support file locations
 

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 6757b7ca18c31282cd00f038891819fe4dad77fb..dbe8fc2ed28e9193a3b47639742a58d97b812424 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -138,7 +138,7 @@ sub special_compile_target
                {
                return << "EOF";
 \$(TMP_D)/x86_64-gcc.o:        crypto/bn/asm/x86_64-gcc.c
-       \$(CC) \$(CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
+       \$(CC) \$(LIB_CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
 EOF
                }
        return undef;