Skip to content

merge stable #447

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.

Sign up for GitHub

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
rainers merged 3 commits into from
Apr 30, 2020
Merged

merge stable #447

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a0ccbf
Merge remote-tracking branch 'upstream/master' into stable
MartinNowak Apr 23, 2020
4886449
pass HOST_DC and HOST_DMD to workaround repo differences
MartinNowak Apr 28, 2020
83aa593
Merge remote-tracking branch 'upstream/stable' into merge_stable
MartinNowak Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions create_dmd_release/create_dmd_release.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ void cleanAll(Bits bits, string branch)
auto bitsStr = bits == Bits.bits32? "32" : "64";
auto bitsDisplay = toString(bits);
auto makeModel = " MODEL="~bitsStr;
auto hostDMDEnv = " HOST_DC="~hostDMD;
auto hostDMDEnv = " HOST_DC="~hostDMD~" HOST_DMD="~hostDMD;
auto latest = " LATEST="~branch;

// common make arguments
Expand Down Expand Up @@ -407,7 +407,7 @@ void buildAll(Bits bits, string branch, bool dmdOnly=false)
auto dmdEnv = " DMD=../dmd/generated/"~osDirName~"/release/"~bitsStr~"/dmd"~exe;
enum dmdConf = "dmd.conf";
}
auto hostDMDEnv = " HOST_DC="~hostDMD;
auto hostDMDEnv = " HOST_DC="~hostDMD~" HOST_DMD="~hostDMD;
auto isRelease = " ENABLE_RELEASE=1";
auto latest = " LATEST="~branch;
// PIC libraries on amd64 for PIE-by-default distributions, see Bugzilla 16794
Expand Down