@@ -483,7 +483,7 @@ ifeq ($(IS_ARMV8),1)
483483
484484 TPROG = TestPrograms/test_arm_asimd.cxx
485485 TOPT = -march=armv8-a
486- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
486+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
487487 ifeq ($(strip $(HAVE_OPT)),0)
488488 ASIMD_FLAG = -march=armv8-a
489489 ARIA_FLAG = -march=armv8-a
@@ -506,7 +506,7 @@ ifeq ($(IS_ARMV8),1)
506506 ifneq ($(ASIMD_FLAG),)
507507 TPROG = TestPrograms/test_arm_crc.cxx
508508 TOPT = -march=armv8-a+crc
509- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
509+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
510510 ifeq ($(strip $(HAVE_OPT)),0)
511511 CRC_FLAG = -march=armv8-a+crc
512512 else
@@ -515,7 +515,7 @@ ifeq ($(IS_ARMV8),1)
515515
516516 TPROG = TestPrograms/test_arm_aes.cxx
517517 TOPT = -march=armv8-a+crypto
518- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
518+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
519519 ifeq ($(strip $(HAVE_OPT)),0)
520520 AES_FLAG = -march=armv8-a+crypto
521521 else
@@ -524,7 +524,7 @@ ifeq ($(IS_ARMV8),1)
524524
525525 TPROG = TestPrograms/test_arm_pmull.cxx
526526 TOPT = -march=armv8-a+crypto
527- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
527+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
528528 ifeq ($(strip $(HAVE_OPT)),0)
529529 GCM_FLAG = -march=armv8-a+crypto
530530 GF2N_FLAG = -march=armv8-a+crypto
@@ -534,7 +534,7 @@ ifeq ($(IS_ARMV8),1)
534534
535535 TPROG = TestPrograms/test_arm_sha.cxx
536536 TOPT = -march=armv8-a+crypto
537- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
537+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
538538 ifeq ($(strip $(HAVE_OPT)),0)
539539 SHA_FLAG = -march=armv8-a+crypto
540540 else
@@ -543,15 +543,15 @@ ifeq ($(IS_ARMV8),1)
543543
544544 TPROG = TestPrograms/test_arm_sm3.cxx
545545 TOPT = -march=armv8.4-a+crypto
546- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
546+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
547547 ifeq ($(strip $(HAVE_OPT)),0)
548548 SM3_FLAG = -march=armv8.4-a+crypto
549549 SM4_FLAG = -march=armv8.4-a+crypto
550550 endif
551551
552552 TPROG = TestPrograms/test_arm_sha3.cxx
553553 TOPT = -march=armv8.4-a+crypto
554- HAVE_OPT = $(shell $(CXX ) $(CXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
554+ HAVE_OPT = $(shell $(CXX ) $(TCXXFLAGS ) $(ACLE_FLAG ) $(ZOPT ) $(TOPT ) $(TPROG ) -o $(TOUT ) 2>&1 | tr ' ' '\n' | wc -l)
555555 ifeq ($(strip $(HAVE_OPT)),0)
556556 SHA3_FLAG = -march=armv8.4-a+crypto
557557 endif
0 commit comments