Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add targets for Win32/COFF to win64.mak #3150

Merged
merged 3 commits into from Jun 18, 2015

Conversation

rainers
Copy link
Member

@rainers rainers commented Apr 5, 2015

This adds targets phobos32mscoff and unittest32mscoff to win64.mak.

The 32-bit compiler is derived from the setting for the 64-bit compiler, but can be overwritten on the make command line with CC32=

The usual conditions for VCDIR and SDKDIR apply, though the default is improved by using $(ProgramFiles). As for Win64 since the -conf= setting, it is necessary to set LINKCMDand LIB in the environment to link the unittests.

@rainers
Copy link
Member Author

rainers commented Apr 5, 2015

The build fails because the tester tries to patch the makefile instead of passing changed variables as command line arguments.

@@ -481,6 +481,17 @@ cov : $(SRC_TO_COMPILE) $(LIB)

html : $(DOCS)

################### Win32 COFF support #########################

# default to 32-bit compiler relative to 64-bit compiler, link and lib are architecture agnostic
Copy link
Member

Choose a reason for hiding this comment

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

I don't know what "32-bit compiler relative to 64-bit compiler" means.

Copy link
Member Author

Choose a reason for hiding this comment

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

The VC 32-bit compiler is in the parent folder of the folder that contains the 64-bit compiler, e.g. for the default CC="$(VCDIR)\bin\amd64\cl", the 32-bit compiler is CC32="$(VCDIR)\bin\cl". Maybe there is a better wording...

Copy link
Member

Choose a reason for hiding this comment

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

"relative to the location of the 64 bit compiler"

Copy link
Member Author

Choose a reason for hiding this comment

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

"relative to the location of the 64 bit compiler"

Ah, ok. That's where the confusion comes from. I've updated the comment.

@WalterBright
Copy link
Member

Auto-merge toggled on

WalterBright added a commit that referenced this pull request Jun 18, 2015
Add targets for Win32/COFF to win64.mak
@WalterBright WalterBright merged commit ec8fb20 into dlang:master Jun 18, 2015
WalterBright added a commit that referenced this pull request Aug 26, 2015
Add targets for Win32/COFF to win64.mak
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants