Page MenuHomeFreeBSD
Files F144609532

D55156.diff
No OneTemporary
Actions

D55156.diff
View Options

diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile
--- a/lib/googletest/gmock/Makefile
+++ b/lib/googletest/gmock/Makefile
@@ -11,6 +11,11 @@
CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include
LIBADD+= gtest
+# Only required for GCC
+.if ${MACHINE_CPUARCH} == "aarch64"
+LIBADD+= compiler_rt
+.endif
+
LDFLAGS+= -L${.OBJDIR:H}/gtest
INCSGROUPS= MAIN_INCS INTERNAL_INCS INTERNAL_CUSTOM_INCS
diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile
--- a/lib/googletest/gtest/Makefile
+++ b/lib/googletest/gtest/Makefile
@@ -43,5 +43,9 @@
SRCS+= gtest-all.cc
LIBADD+= pthread regex
+# Only required for GCC
+.if ${MACHINE_CPUARCH} == "aarch64"
+LIBADD+= compiler_rt
+.endif
.include <bsd.lib.mk>
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -398,7 +398,13 @@
_DP_cuse= pthread
_DP_atf_cxx= atf_c
_DP_gtest= pthread regex
+.if ${MACHINE_CPUARCH} == "aarch64"
+_DP_gtest+= compiler_rt
+.endif
_DP_gmock= gtest
+.if ${MACHINE_CPUARCH} == "aarch64"
+_DP_gmock+= compiler_rt
+.endif
_DP_gmock_main= gmock
_DP_gtest_main= gtest
_DP_devstat= kvm

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 11, 5:43 AM (20 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28639019
Default Alt Text
D55156.diff (1 KB)

Event Timeline