diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-01 19:06:39 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-01 19:06:39 +0000 |
| commit | 8a2024ea599d28fad54b3b66f28c2c22dcc3af9c (patch) | |
| tree | eb29416b289b968c8e2a4aacd9f3cf7e98b9ae3b /fips/Makefile | |
| parent | 42c7c6764e91b6c851d86572e6b43c71b94a21b9 (diff) | |
Handle multiple CPUID_OBJ correctly.
Diffstat (limited to 'fips/Makefile')
| -rw-r--r-- | fips/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fips/Makefile b/fips/Makefile index e84a4fb044..61056a8f59 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -92,11 +92,8 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o list="$(DES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \ list="$(SHA1_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \ list="$(MODES_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/modes/$$i" ; done; \ - if [ -n "$(CPUID_OBJ)" ]; then \ - CPUID=../crypto/$(CPUID_OBJ) ; \ - else \ - CPUID="" ; \ - fi ; \ + CPUID=""; \ + list="$(CPUID_OBJ)"; for i in $$list; do CPUID="$$CPUID ../crypto/$$i" ; done; \ objs="fips_start.o $(LIBOBJ) $(FIPS_EX_OBJ) $$CPUID $$FIPS_ASM"; \ for i in $(FIPS_OBJ_LISTS); do \ dir=`dirname $$i`; script="s|^|$$dir/|;s| | $$dir/|g"; \ |