Add support to the installed cross-compiler for RISCV

The change is to ensure the installed cross-compiler
is correctly set up on the host system from OpenJDK11
perspective by changing the prefix of the cross-toolchain
if users prefer the installed cross-compiler rather than
building a cross-compiler from the source.

Issue: ibmruntimes#218

Signed-off-by: Cheng Jin <[email protected]>

Author: Cheng Jin

closed/autoconf/custom-spec.gmk.in

@@ -25,7 +25,8 @@
 # $1 the name of the makefile
 define IncludeCustomExtension
   ifndef OPENJDK
-    custom_include_file := $(TOPDIR)/closed/custom/$(strip $1)
+    custom_dir := closed/make
+    custom_include_file := $$(TOPDIR)/$$(custom_dir)/$(strip $1)
     ifneq ($$(wildcard $$(custom_include_file)), )
       include $$(custom_include_file)
     endif
@@ -138,6 +139,12 @@ endif
 ifeq (riscv64,$(OPENJDK_TARGET_CPU))
   ifeq (cross,$(COMPILE_TYPE))
     export SYSROOT_CFLAGS
+    export RISCV_CROSSTOOLS_PREFIX := riscv64-unknown-linux-gnu
+    # change the prefix of the cross toolchain if the corresponding
+    # software package is installed on the host system.
+    ifeq (install,$(RISCV_TOOLCHAIN_TYPE))
+       export RISCV_CROSSTOOLS_PREFIX := riscv64-linux-gnu
+    endif
   else
     JAVA_FLAGS += -DserverStartupTimeout=36000
   endif