Skip to content

Fix CoreFoundation standalone build syntax errors #543

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

Merged
merged 1 commit into from
Aug 14, 2016

Conversation

copumpkin
Copy link
Contributor

@copumpkin copumpkin commented Aug 14, 2016

Not sure how these trailing quotes crept in, but the file doesn't parse unless you remove them.

Also, the standalone build still doesn't work for me unless I add some hackery to bring <CoreFoundation/CFAsmMacros.h> into the search path. I've worked around it in my build but I don't know what the proper solution is so I'm only including the syntax fixes until that's sorted out.

Edit: This PR now also fixes the CFAsmMacros.h issue.

cc @phausler @CodaFi

@CodaFi
Copy link
Contributor

CodaFi commented Aug 14, 2016

You can insert Base.subproj/CFAsmMacros.h into the private part of CoreFoundation's build.py.

@copumpkin
Copy link
Contributor Author

@CodaFi oh thanks! that did it. Should I submit a separate pull request to fix that?

@CodaFi
Copy link
Contributor

CodaFi commented Aug 14, 2016

Naw, this one works just fine.

Not sure how these trailing quotes crept in, but the file doesn't parse
unless you remove them. The build also fails without CFAsmMacros.h in
scope, so I added that to the private headers list.
@copumpkin
Copy link
Contributor Author

@CodaFi done 😄 thanks again!

@CodaFi
Copy link
Contributor

CodaFi commented Aug 14, 2016

I've verified that this fix builds locally on OS X and Linux. Merging.

@CodaFi CodaFi merged commit dce4233 into swiftlang:master Aug 14, 2016
@phausler
Copy link
Contributor

Awesome, thanks for the cleanup!

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