diff options
author | Ben Laurie <ben@links.org> | 2013-10-20 21:54:46 +0100 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2014-02-09 12:49:04 +0000 |
commit | 6311681236779c386137429b0e45ae7a7eb904f4 (patch) | |
tree | 73a6999ab2f15d044657fabde6e608f4cad8b227 | |
parent | b45e874d7c4a8fdac7ec10cff43f21d02e75d511 (diff) |
Build on MacOS.
-rwxr-xr-x | GitConfigure | 4 | ||||
-rwxr-xr-x | GitMake | 4 | ||||
-rwxr-xr-x | util/mk1mf.pl | 4 | ||||
-rw-r--r-- | util/pl/unix.pl | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/GitConfigure b/GitConfigure index bbab33ebc5..0821031afa 100755 --- 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 @@ -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 2b383e2339..94691df98a 100755 --- 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 6757b7ca18..dbe8fc2ed2 100644 --- 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; |