Skip to content

Fixes for the macOS build (iPhone with Xcode) #555

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
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes for the macOS build (iPhone with Xcode) #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e551a6
add more flags need to be sent local
cinakyn Jul 27, 2020
27f52dc
add /var/tmp into environment for clang bitcode
cinakyn Jul 27, 2020
325aee7
remove special PCH handling also from call_cpp
cinakyn Jul 27, 2020
2cf9102
ignore flag which is added by Xcode GUI
cinakyn Jul 30, 2020
43dc8f1
Revert "remove special PCH handling also from call_cpp"
cinakyn Aug 11, 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
8 changes: 7 additions & 1 deletion client/arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ static bool is_argument_with_space(const char* argument)
"-iwithprefixbefore",
"--include-with-prefix-before",
"-iwithsysroot"
"-index-store-path"
};

for(const char* const arg : arguments) {
Expand Down Expand Up @@ -548,11 +549,16 @@ bool analyse_argv(const char * const *argv, CompileJob &job, bool icerun, list<s
|| str_equal("-isystem-after", a)
|| str_equal("-ivfsoverlay", a)
|| str_equal("-iwithprefix", a)
|| str_equal("-serialize-diagnostics", a)
|| str_equal("--serialize-diagnostics", a)
|| str_equal("-fmodules-validate-once-per-build-session", a)
|| str_startswith("-fbuild-session-file=", a)
|| str_equal("--include-with-prefix", a)
|| str_equal("--include-with-prefix-after", a)
|| str_equal("-iwithprefixbefore", a)
|| str_equal("--include-with-prefix-before", a)
|| str_equal("-iwithsysroot", a)) {
|| str_equal("-iwithsysroot", a)
|| str_equal("-index-store-path", a)) {
args.append(a, Arg_Local);

assert( is_argument_with_space( a ));
Expand Down
4 changes: 4 additions & 0 deletions client/icecc-create-env.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,10 @@ if test -n "$clang"; then
touch $tempdir/fakeproc/proc/cpuinfo
add_file $tempdir/fakeproc/proc/cpuinfo /proc/cpuinfo
fi
# clang needs tmp directory when it used with "-fembed-bitcode"
mkdir -p $tempdir/fakevar/tmp
touch $tempdir/fakevar/tmp/DUMMY
add_file $tempdir/fakevar/tmp/DUMMY /var/tmp/DUMMY
fi

# Do not do any prefix stripping on extra files, they (e.g. clang plugins) are usually
Expand Down