comparison make/solaris/makefiles/product.make @ 22313:2c87ecb88c81

Merge with basic-graal
author Doug Simon <doug.simon@oracle.com>
date Fri, 24 Jul 2015 02:11:18 +0200
parents c28cb37b2e1d
children
comparison
equal deleted inserted replaced
22293:a12693d78272 22313:2c87ecb88c81
64 # Set the environment variable HOTSPARC_GENERIC to "true" 64 # Set the environment variable HOTSPARC_GENERIC to "true"
65 # to inhibit the effect of the previous line on CFLAGS. 65 # to inhibit the effect of the previous line on CFLAGS.
66 66
67 # Linker mapfiles 67 # Linker mapfiles
68 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers 68 MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
69 ifdef JVMCI
70 MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-JVMCI
71 endif
72 69
73 ifndef USE_GCC 70 ifndef USE_GCC
74 # This mapfile is only needed when compiling with dtrace support, 71 # This mapfile is only needed when compiling with dtrace support,
75 # and mustn't be otherwise. 72 # and mustn't be otherwise.
76 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) 73 MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)