--- a/make/RunTestsPrebuilt.gmk Fri Oct 12 16:37:22 2018 -0700
+++ b/make/RunTestsPrebuilt.gmk Sat Oct 13 03:02:28 2018 +0200
@@ -95,12 +95,12 @@
# $1: The output file name
# $2..$N: The lines to output to the file
define CreateNewSpec
- $(if $(strip $(29)), \
+ $(if $(strip $(30)), \
$(error Internal makefile error: \
Too many arguments to macro, please update CreateNewSpec in RunTestsPrebuilt.gmk) \
) \
$(shell $(RM) $1) \
- $(foreach i, $(call sequence, 2, 28), \
+ $(foreach i, $(call sequence, 2, 29), \
$(if $(strip $($i)), \
$(call AppendFile, $(strip $($i)), $1) \
) \
@@ -241,19 +241,23 @@
LD := $(DEVKIT_HOME)/VC/bin/x64/link
LIBRARY_PREFIX :=
SHARED_LIBRARY_SUFFIX := .dll
+ EXE_SUFFIX := .exe
else ifeq ($(OPENJDK_TARGET_OS), linux)
LD := $(DEVKIT_HOME)/bin/ld
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .so
+ EXE_SUFFIX :=
else ifeq ($(OPENJDK_TARGET_OS), macosx)
LD := $(DEVKIT_HOME)/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .dylib
+ EXE_SUFFIX :=
else ifeq ($(OPENJDK_TARGET_OS), solaris)
# Prefer system linker for AOT on Solaris.
LD := ld
LIBRARY_PREFIX := lib
SHARED_LIBRARY_SUFFIX := .so
+ EXE_SUFFIX :=
endif
else
LD := ld
@@ -297,6 +301,7 @@
LD := $(LD), \
LIBRARY_PREFIX := $(LIBRARY_PREFIX), \
SHARED_LIBRARY_SUFFIX := $(SHARED_LIBRARY_SUFFIX), \
+ EXE_SUFFIX := $(EXE_SUFFIX), \
include $(TOPDIR)/make/RunTestsPrebuiltSpec.gmk, \
$(CUSTOM_NEW_SPEC_LINE), \
)