--- a/make/lib/Lib-jdk.hotspot.agent.gmk	Mon Nov 04 13:58:33 2019 +0100
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk	Mon Nov 04 22:31:59 2019 +0900
@@ -53,10 +53,16 @@
   endif
 endif
 
+SA_TOOLCHAIN := $(TOOLCHAIN_DEFAULT)
+ifeq ($(call isTargetOs, linux), true)
+  SA_TOOLCHAIN := TOOLCHAIN_BUILD_LINK_CXX
+endif
+
 ################################################################################
 
 $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
     NAME := saproc, \
+    TOOLCHAIN := $(SA_TOOLCHAIN), \
     OPTIMIZATION := HIGH, \
     DISABLED_WARNINGS_microsoft := 4267, \
     DISABLED_WARNINGS_gcc := sign-compare pointer-arith, \