Skip to content

fix: disable remote preprocessing if -imacros is passed #652

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

Open
git-bruh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: disable remote preprocessing if -imacros is passed #652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions client/arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ int analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<st
bool wunused_macros = false;
bool seen_arch = false;
bool seen_pedantic = false;
bool seen_imacros = false;
bool seen_march_native = false;
bool seen_mcpu_native = false;
bool seen_mtune_native = false;
Expand Down Expand Up @@ -554,6 +555,9 @@ int analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<st
|| str_equal("-iwithprefixbefore", a)
|| str_equal("--include-with-prefix-before", a)
|| str_equal("-iwithsysroot", a)) {
if (str_equal("-imacros", a)) {
seen_imacros = true;
}
args.append(a, Arg_Local);

assert( is_argument_with_space( a ));
Expand Down Expand Up @@ -888,6 +892,12 @@ int analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<st
job.setBlockRewriteIncludes(true);
}

// -imacros doesn't define any macros when used with remote preprocessing
if ( seen_imacros ) {
log_warning() << "argument -imacros, forcing local preprocessing" << endl;
job.setBlockRewriteIncludes(true);
}

// -pedantic doesn't work with remote preprocessing, if extensions to a named standard
// are allowed. GCC allows GNU extensions by default, so let's check if a standard
// other than eg gnu11 or gnu++14 was specified.
Expand Down