File tree Expand file tree Collapse file tree 1 file changed +11
-4
lines changed Expand file tree Collapse file tree 1 file changed +11
-4
lines changed Original file line number Diff line number Diff line change 11
2- # Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
2+ # Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44#
55# This code is free software; you can redistribute it and/or modify it
@@ -28,14 +28,21 @@ default: all
2828
2929IDEA_OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/verify-idea
3030
31+ # Unset these variables to avoid having the current environment interfere with
32+ # the idea generation script. SPEC needs to remain as idea.sh will call back to
33+ # make and that call needs to have SPEC defined.
34+ unexport HAS_SPEC
35+ unexport CONF
36+ unexport CONF_NAME
37+
3138clean-idea:
3239 $(RM) -r $(IDEA_OUTPUT_DIR)
3340
3441verify-idea:
3542 $(MKDIR) -p $(IDEA_OUTPUT_DIR)
36- cd $(WORKSPACE_ROOT) && HAS_SPEC= MAKEFLAGS= MFLAGS= $(BASH) $(TOPDIR)/bin/idea.sh -o $(IDEA_OUTPUT_DIR)/idea1
37- cd $(WORKSPACE_ROOT) && HAS_SPEC= MAKEFLAGS= MFLAGS= $(BASH) $(TOPDIR)/bin/idea.sh -o $(IDEA_OUTPUT_DIR)/idea2 java.base
38- cd $(WORKSPACE_ROOT) && HAS_SPEC= MAKEFLAGS= MFLAGS= $(BASH) $(TOPDIR)/bin/idea.sh -o $(IDEA_OUTPUT_DIR)/idea3 java.base jdk.compiler
43+ cd $(WORKSPACE_ROOT) && MAKEFLAGS= MFLAGS= $(BASH) $(TOPDIR)/bin/idea.sh -o $(IDEA_OUTPUT_DIR)/idea1
44+ cd $(WORKSPACE_ROOT) && MAKEFLAGS= MFLAGS= $(BASH) $(TOPDIR)/bin/idea.sh -o $(IDEA_OUTPUT_DIR)/idea2 java.base
45+ cd $(WORKSPACE_ROOT) && MAKEFLAGS= MFLAGS= $(BASH) $(TOPDIR)/bin/idea.sh -o $(IDEA_OUTPUT_DIR)/idea3 java.base jdk.compiler
3946
4047TEST_TARGETS += verify-idea
4148
You can’t perform that action at this time.
0 commit comments