# HG changeset patch
# User Stefan Anzinger <stefan.anzinger@oracle.com>
# Date 1433957128 -7200
# Node ID a04b45953250c263af27d7123237e3f5345df9b4
# Parent  1a6a520af3b5a2ec9abc10a457374cf0fd18c7be
Append -nojvmci to the compiler directory when building without jvmci

diff -r 1a6a520af3b5 -r a04b45953250 make/aix/makefiles/defs.make
--- a/make/aix/makefiles/defs.make	Wed Jun 10 14:56:49 2015 +0200
+++ b/make/aix/makefiles/defs.make	Wed Jun 10 19:25:28 2015 +0200
@@ -192,9 +192,9 @@
 #    EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
 #  endif
 #endif
-EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
+EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server$(COMPILER_DIR_SUFFIX)
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client$(COMPILER_DIR_SUFFIX)
+EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal$(COMPILER_DIR_SUFFIX)
 
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
diff -r 1a6a520af3b5 -r a04b45953250 make/bsd/makefiles/defs.make
--- a/make/bsd/makefiles/defs.make	Wed Jun 10 14:56:49 2015 +0200
+++ b/make/bsd/makefiles/defs.make	Wed Jun 10 19:25:28 2015 +0200
@@ -280,9 +280,9 @@
   endif
 endif
 
-EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
+EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server$(COMPILER_DIR_SUFFIX)
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client$(COMPILER_DIR_SUFFIX)
+EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal$(COMPILER_DIR_SUFFIX)
 
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
diff -r 1a6a520af3b5 -r a04b45953250 make/defs.make
--- a/make/defs.make	Wed Jun 10 14:56:49 2015 +0200
+++ b/make/defs.make	Wed Jun 10 19:25:28 2015 +0200
@@ -113,6 +113,11 @@
   endif
 endif
 
+# If we build a no-jvmci-version, we suffix the compiler dir with -nojvmci
+ifeq ($(COMPILER_DIR_SUFFIX)$(INCLUDE_JVMCI),)
+	COMPILER_DIR_SUFFIX=-nojvmci
+endif
+
 # hotspot version definitions
 include $(GAMMADIR)/make/hotspot_version
 
diff -r 1a6a520af3b5 -r a04b45953250 make/linux/makefiles/defs.make
--- a/make/linux/makefiles/defs.make	Wed Jun 10 14:56:49 2015 +0200
+++ b/make/linux/makefiles/defs.make	Wed Jun 10 19:25:28 2015 +0200
@@ -265,9 +265,9 @@
     EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
   endif
 endif
-EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal
+EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server$(COMPILER_DIR_SUFFIX)
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client$(COMPILER_DIR_SUFFIX)
+EXPORT_MINIMAL_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/minimal$(COMPILER_DIR_SUFFIX)
 
 ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK) $(JVM_VARIANT_CORE)), true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
diff -r 1a6a520af3b5 -r a04b45953250 make/solaris/makefiles/defs.make
--- a/make/solaris/makefiles/defs.make	Wed Jun 10 14:56:49 2015 +0200
+++ b/make/solaris/makefiles/defs.make	Wed Jun 10 19:25:28 2015 +0200
@@ -233,8 +233,8 @@
   endif
 endif
 
-EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
-EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server$(COMPILER_DIR_SUFFIX)
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client$(COMPILER_DIR_SUFFIX)
 
 ifeq ($(JVM_VARIANT_SERVER),true)
   EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt