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

Config file: Use a separate section for multilib targets #3276

Merged
merged 1 commit into from
Jan 12, 2020

Conversation

kinke
Copy link
Member

@kinke kinke commented Jan 11, 2020

No description provided.

@kinke kinke force-pushed the add_section branch 7 times, most recently from 0073c70 to 7f1b1a0 Compare January 11, 2020 21:33
@kinke kinke marked this pull request as ready for review January 11, 2020 21:44
@kinke
Copy link
Member Author

kinke commented Jan 12, 2020

This transitions from a single merged default section:

default:
{
    switches = [
        "-defaultlib=phobos2-ldc,druntime-ldc",
        "-L--no-warn-search-mismatch",
    ];
    post-switches = [
        "-I%%ldcbinarypath%%/../import",
    ];
    lib-dirs = [
        "%%ldcbinarypath%%/../lib",
        "%%ldcbinarypath%%/../lib32",
    ];
    rpath = "%%ldcbinarypath%%/../lib:%%ldcbinarypath%%/../lib32";
};

to 2 distinct sections, the multilib one overriding lib dir and rpath:

default:
{
    switches = [
        "-defaultlib=phobos2-ldc,druntime-ldc",
    ];
    post-switches = [
        "-I%%ldcbinarypath%%/../import",
    ];
    lib-dirs = [
        "%%ldcbinarypath%%/../lib",
    ];
    rpath = "%%ldcbinarypath%%/../lib";
};

"i686-.*-linux-gnu":
{
    lib-dirs = [
        "%%ldcbinarypath%%/../lib32",
    ];
    rpath = "%%ldcbinarypath%%/../lib32";
};

This resolves issues wrt. the --no-warn-search-mismatch linker flag (LLD: no support, gold: #3262 (comment)).

@kinke
Copy link
Member Author

kinke commented Jan 12, 2020

Merging eagerly as prerequisite for #3262.

@kinke kinke merged commit b053566 into ldc-developers:master Jan 12, 2020
@kinke kinke deleted the add_section branch January 12, 2020 14:48
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.

1 participant