Skip to content

Commit

Permalink
8325972: Add -x to bash for building with LOG=debug
Browse files Browse the repository at this point in the history 
Reviewed-by: erikj
  • Loading branch information
@magicus
magicus committed Feb 19, 2024
1 parent a19314b commit 8668198
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion make/common/MakeBase.gmk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -152,6 +152,10 @@ define SetupLogging
endif
endif

ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
SHELL := $$(SHELL) -x
endif

ifeq ($$(LOG_LEVEL), trace)
SHELL_NO_RECURSE := $$(SHELL)
# Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
Expand Down

5 comments on commit 8668198

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@luchenlin
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8668198 Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@luchenlin the backport was successfully created on the branch backport-luchenlin-8668198c in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8668198c from the openjdk/jdk repository.

The commit being backported was authored by Magnus Ihse Bursie on 19 Feb 2024 and was reviewed by Erik Joelsson.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-luchenlin-8668198c:backport-luchenlin-8668198c
$ git checkout backport-luchenlin-8668198c
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-luchenlin-8668198c

@luchenlin
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 8668198 Mar 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@luchenlin Could not automatically backport 8668198c to openjdk/jdk17u-dev due to conflicts in the following files:

  • make/common/MakeBase.gmk

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-luchenlin-8668198c

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 8668198c26bdac412f0a9d1255ca74da860761c5

# Backport the commit
$ git cherry-pick --no-commit 8668198c26bdac412f0a9d1255ca74da860761c5
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 8668198c26bdac412f0a9d1255ca74da860761c5'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 8668198c26bdac412f0a9d1255ca74da860761c5.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 8668198c from the openjdk/jdk repository.

The commit being backported was authored by Magnus Ihse Bursie on 19 Feb 2024 and was reviewed by Erik Joelsson.

Thanks!

Please sign in to comment.