Skip to content

Comments

Somewhat clean up win64.mak#8482

Merged
dkorpel merged 1 commit intodlang:masterfrom
kinke:cleanup_win64.mak
Jun 28, 2022
Merged

Somewhat clean up win64.mak#8482
dkorpel merged 1 commit intodlang:masterfrom
kinke:cleanup_win64.mak

Conversation

@kinke
Copy link
Contributor

@kinke kinke commented Jun 22, 2022

  • Remove some unused variables.
  • Default to a matching MSVC cl.exe & lib.exe in PATH instead of an ancient Visual Studio 2010 installation.
  • Remove explicit 32-bit recipes, requiring a separate make invocation.

Analogous to dlang/druntime#3853.

@dlang-bot
Copy link
Contributor

Thanks for your pull request and interest in making D better, @kinke! We are looking forward to reviewing it, and you should be hearing from a maintainer soon.
Please verify that your PR follows this checklist:

  • My PR is fully covered with tests (you can see the coverage diff by visiting the details link of the codecov check)
  • My PR is as minimal as possible (smaller, focused PRs are easier to review than big ones)
  • I have provided a detailed rationale explaining my changes
  • New or modified functions have Ddoc comments (with Params: and Returns:)

Please see CONTRIBUTING.md for more information.


If you have addressed all reviews or aren't sure how to proceed, don't hesitate to ping us with a simple comment.

Bugzilla references

Your PR doesn't reference any Bugzilla issue.

If your PR contains non-trivial changes, please reference a Bugzilla issue or create a manual changelog.

Testing this PR locally

If you don't have a local development environment setup, you can use Digger to test this PR:

dub run digger -- build "master + phobos#8482"

install: phobos.zip
$(CP) phobos.lib phobos64.lib $(DIR)\windows\lib
install: phobos.zip $(LIB)
copy /y /b $(LIB) $(DIR)\windows\lib
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like this is unused - it a) didn't make sure the lib is actually built beforehand, and b) tried to copy a phobos.lib, which should have never existed (no MODEL suffix).

* Remove some unused variables.
* Default to a matching MSVC cl.exe & lib.exe in PATH instead of an
  ancient Visual Studio 2010 installation.
* Remove explicit 32-bit recipes, requiring a separate make
  invocation.

Analogous to dlang/druntime#3853.
@kinke kinke force-pushed the cleanup_win64.mak branch from b513477 to d8f3b19 Compare June 24, 2022 18:38
@dkorpel dkorpel merged commit 18bb597 into dlang:master Jun 28, 2022
@kinke kinke deleted the cleanup_win64.mak branch June 28, 2022 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants