8301267: Update of config.guess broke build on WSL

[erikj79]

After JDK-8300805, config.guess has changed output when running on WSL. This is caused by the autoconf-config.guess now reporting it as x86_64-pc-linux-gnu instead of x86_64-unknown-linux-gnu, and our wrapper script is expecting the latter.

This patch makes the wrapper script work with either variant.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8301267: Update of config.guess broke build on WSL

Reviewers

• Tim Bell (@tbell29552 - Reviewer)
• Jorn Vernee (@JornVernee - Reviewer)
• Daniel Jeliński (@djelinski - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12268/head:pull/12268
$ git checkout pull/12268

Update a local copy of the PR:
$ git checkout pull/12268
$ git pull https://git.openjdk.org/jdk pull/12268/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12268

View PR using the GUI difftool:
$ git pr show -t 12268

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12268.diff

[bridgekeeper]

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@erikj79 The following label will be automatically applied to this pull request:

• build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (6ce095ac)

[openjdk]

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8301267: Update of config.guess broke build on WSL

Reviewed-by: tbell, jvernee, djelinski

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 32 new commits pushed to the master branch:

• a128a5d: 8300810: Get rid of unused JDI removeListener() methods
• a91143c: 8298907: nsk JDI tests pass if the debuggee failed to launch
• 3238139: 8300916: Re-examine the initialization of JNU Charset in StaticProperty
• f4592b1: 8267935: Replace BasicHashtable and Hashtable
• a74ebd0: 8299325: java/net/httpclient/CancelRequestTest.java fails "test CancelRequestTest.testGetSendAsync("https://localhost:46509/https1/x/same/interrupt", true, true)"
• 041a12e: 8301255: Http2Connection may send too many GOAWAY frames
• 476f58a: 8298424: Remove redundant FOUND_CORES variable in build-performance.m4
• ebb84ad: 8301036: RISC-V: Factor out functions baseOffset & baseOffset32 from MacroAssembler
• 61a5f11: 8301033: RISC-V: Handle special cases for MinI/MaxI nodes for Zbb
• 82df4a2: 8301148: Serial: Remove ContiguousSpace::reset_saved_mark
• ... and 22 more: https://git.openjdk.org/jdk/compare/7f05d57a87d8b41b53194aa0dacc4057cbb58544...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[JornVernee]

Works here, thanks!

[djelinski]

Thanks for the quick fix!

[erikj79]

/integrate

[openjdk]

Going to push as commit b84f4c4.
Since your change was applied there have been 32 commits pushed to the master branch:

• a128a5d: 8300810: Get rid of unused JDI removeListener() methods
• a91143c: 8298907: nsk JDI tests pass if the debuggee failed to launch
• 3238139: 8300916: Re-examine the initialization of JNU Charset in StaticProperty
• f4592b1: 8267935: Replace BasicHashtable and Hashtable
• a74ebd0: 8299325: java/net/httpclient/CancelRequestTest.java fails "test CancelRequestTest.testGetSendAsync("https://localhost:46509/https1/x/same/interrupt", true, true)"
• 041a12e: 8301255: Http2Connection may send too many GOAWAY frames
• 476f58a: 8298424: Remove redundant FOUND_CORES variable in build-performance.m4
• ebb84ad: 8301036: RISC-V: Factor out functions baseOffset & baseOffset32 from MacroAssembler
• 61a5f11: 8301033: RISC-V: Handle special cases for MinI/MaxI nodes for Zbb
• 82df4a2: 8301148: Serial: Remove ContiguousSpace::reset_saved_mark
• ... and 22 more: https://git.openjdk.org/jdk/compare/7f05d57a87d8b41b53194aa0dacc4057cbb58544...master

Your commit was automatically rebased without conflicts.

[openjdk]

@erikj79 Pushed as commit b84f4c4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.