fix testme.sh and compilation

This commit is contained in:
Steffen Jaeckel 2017-04-01 00:34:19 +02:00
parent b8527e92f8
commit a7d5af27a3
2 changed files with 10 additions and 8 deletions

View File

@ -8,12 +8,6 @@ else
silent=@ silent=@
endif endif
%.o: %.c
ifneq ($V,1)
@echo " * ${CC} $@"
endif
${silent} ${CC} -c ${CFLAGS} $^ -o $@
#default files to install #default files to install
ifndef LIBNAME ifndef LIBNAME
LIBNAME=libtommath.a LIBNAME=libtommath.a
@ -23,6 +17,12 @@ coverage: LIBNAME:=-Wl,--whole-archive $(LIBNAME) -Wl,--no-whole-archive
include makefile.include include makefile.include
%.o: %.c
ifneq ($V,1)
@echo " * ${CC} $@"
endif
${silent} ${CC} -c ${CFLAGS} $< -o $@
LCOV_ARGS=--directory . LCOV_ARGS=--directory .
#START_INS #START_INS
@ -53,6 +53,8 @@ bn_s_mp_sqr.o bn_s_mp_sub.o
#END_INS #END_INS
$(OBJECTS): $(HEADERS)
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
$(AR) $(ARFLAGS) $@ $(OBJECTS) $(AR) $(ARFLAGS) $@ $(OBJECTS)
$(RANLIB) $@ $(RANLIB) $@

View File

@ -113,7 +113,7 @@ do
COMPILERS="gcc clang" COMPILERS="gcc clang"
ARCHFLAGS="-m64 -m32 -mx32" ARCHFLAGS="-m64 -m32 -mx32"
;; ;;
--help) --help | -h)
_help _help
;; ;;
esac esac
@ -158,7 +158,7 @@ do
for a in "${archflags[@]}" for a in "${archflags[@]}"
do do
if [[ $(expr "$i" : "clang") && "$a" == "-mx32" ]] if [[ $(expr "$i" : "clang") -ne 0 && "$a" == "-mx32" ]]
then then
echo "clang -mx32 tests skipped" echo "clang -mx32 tests skipped"
continue continue