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

Merge remote-tracking branch 'upstream/stable' into merge_stable #1077

Merged
merged 14 commits into from
Feb 21, 2017

Conversation

MartinNowak
Copy link
Member

Conflicts:
source/dub/compilers/compiler.d

s-ludwig and others added 14 commits January 31, 2017 00:57
Also prints the version of the built binary for better default diagnostics.
Mentions the vibe.d compatibility fix and adjusts formatting to match previous change log entries.
- curl workaround was linking against shared phobos library on FreeBSD (shipped since 2.069)
- fixed by moving pkg-config and LIBS stuff under <2.069.0 workaround
Fix 'Failed to apply the selected architecture x86_mscoff. Got ["x86"]' when passing --arch=x86_mscoff
(cherry picked from commit 2039b93)
# Conflicts:
#	source/dub/compilers/compiler.d
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.003%) to 61.589% when pulling 707fed6 on MartinNowak:merge_stable into 2039b93 on dlang:master.

@MartinNowak MartinNowak merged commit 41b245c into dlang:master Feb 21, 2017
@MartinNowak MartinNowak deleted the merge_stable branch February 21, 2017 17:39
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