stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8326585: COMPARE_BUILD=PATCH fails if patch -R fails

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2024-02-23 17:31:13 +00:00
parent c26c5833cc
commit 27574b384c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/InitSupport.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -427,8 +427,9 @@ else # $(HAS_SPEC)=true
# Cleanup after a compare build # Cleanup after a compare build
define CleanupCompareBuild define CleanupCompareBuild
# If running with a COMPARE_BUILD patch, reverse-apply it # If running with a COMPARE_BUILD patch, reverse-apply it, but continue
$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH)) # even if that fails (can happen with removed files).
$(if $(COMPARE_BUILD_PATCH), cd $(topdir) && $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH) || true)
# Move this build away and restore the original build # Move this build away and restore the original build
$(MKDIR) -p $(topdir)/build/compare-build $(MKDIR) -p $(topdir)/build/compare-build
$(MV) $(OUTPUTDIR) $(COMPARE_BUILD_OUTPUTDIR) $(MV) $(OUTPUTDIR) $(COMPARE_BUILD_OUTPUTDIR)