Skip to content

cling Pr 166 #737

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
Axel-Naumann merged 4 commits into from
Jul 5, 2017
Merged

cling Pr 166 #737

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e14908
Formatting.
marsupial Jul 4, 2017
c002a4a
Windows: Don’t enable GNU keywords by default.
marsupial Jul 4, 2017
7378fc8
Don’t change the C++ version from underneath clang, tell it what is d…
marsupial Jul 4, 2017
81438a2
Prefer local LangOptions variable rather than CI->getLangOpts().
marsupial Jul 4, 2017
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
Next Next commit
Formatting.
  • Loading branch information
@marsupial @Axel-Naumann
marsupial authored and Axel-Naumann committed Jul 5, 2017
commit 1e14908cce83ca8c6aaa6a0e6dda283e56286e9c
8 changes: 4 additions & 4 deletions interpreter/cling/lib/Interpreter/CIFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,13 +745,13 @@ static void stringifyPreprocSetting(PreprocessorOptions& PPOpts,
// Would be nice on Linux but will warn 'argument unused during compilation'
// when -nostdinc++ is passed
#ifdef __APPLE__
if (!COpts.StdLib) {
if (!COpts.StdLib) {
#ifdef _LIBCPP_VERSION
argvCompile.push_back("-stdlib=libc++");
argvCompile.push_back("-stdlib=libc++");
#elif defined(__GLIBCXX__)
argvCompile.push_back("-stdlib=libstdc++");
argvCompile.push_back("-stdlib=libstdc++");
#endif
}
}
#endif

if (!COpts.HasOutput || !HasInput) {
Expand Down