--- old/make/lib/Lib-jdk.hotspot.agent.gmk	2019-11-01 17:51:45.716212700 +0900
+++ new/make/lib/Lib-jdk.hotspot.agent.gmk	2019-11-01 17:51:45.075257400 +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, \