8000 Don't add -nostdinc flag just because popen succeeded, make sure we g… by marsupial · Pull Request #30 · root-project/cling · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Don't add -nostdinc flag just because popen succeeded, make sure we g… #30

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

Closed
wants to merge 2 commits into from
Closed

Don't add -nostdinc flag just because popen succeeded, make sure we g… #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ed8074
Don't add -nostdinc flag just because popen succeeded, make sure we g…
marsupial Aug 13, 2016
94b0ee9
When building on Travis, use clone that Travis has already done.
marsupial Aug 13, 2016
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
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ env:
- CCACHE_COMPRESS=1
- CCACHE_MAXSIZE=500M
- CCACHE_CPP2=1
- CLING_BUILD_DEPS=$TRAVIS_BUILD_DIR/deps/
- CLING_LOCAL_BIN=$TRAVIS_BUILD_DIR/bin/
- TIMEOUT=0
- EXECUTE_COMMAND=
- CXX_COMPILER=
Expand Down Expand Up @@ -109,6 +107,9 @@ matrix:
install:
# If cmake is not in the cache, download it.
- |
CLING_USER_ROOT=`dirname $TRAVIS_BUILD_DIR`
export CLING_BUILD_DEPS="$CLING_USER_ROOT/deps"
export CLING_LOCAL_BIN="$CLING_USER_ROOT/bin"
if [ $TRAVIS_OS_NAME == 'linux' ]; then
CMAKE_URL="https://cmake.org/files/v3.6/cmake-3.6.0-Linux-x86_64.tar.gz"
export CMAKE=$CLING_BUILD_DEPS/cmake/bin/cmake
Expand Down Expand Up @@ -147,7 +148,7 @@ before_script:
script:
- |
if [ -z $TRAVIS_TAG ]; then
if [ "$TRAVIS_BRANCH" == "master" ]; then
if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
# Move the tag to newest master
git tag --force cling-nightlies HEAD
git push --force https://$OAUTH_TOKEN@github.com/${TRAVIS_REPO_SLUG} cling-nightlies
Expand Down
5 changes: 3 additions & 2 deletions lib/Interpreter/CIFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,6 @@ namespace {
"| GREP_OPTIONS= grep -E \"(c|g)\\+\\+\"";
if (FILE *pf = ::popen(CppInclQuery, "r")) {

HostCXXI.push_back("-nostdinc++");
char buf[2048];
while (fgets(buf, sizeof(buf), pf) && buf[0]) {
size_t lenbuf = strlen(buf);
Expand All @@ -523,7 +522,9 @@ namespace {
"results in\n";
int ExitCode = system(CppInclQuery);
llvm::errs() << "with exit code " << ExitCode << "\n";
}
} else
HostCXXI.push_back("-nostdinc++");

#endif // _MSC_VER
}

Expand Down
15 changes: 14 additions & 1 deletion tools/packaging/cpt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,20 @@ def make_dmg():
'utf-8')
fetch_llvm(llvm_revision)
fetch_clang(llvm_revision)
fetch_cling('master')

# Travis has already cloned the repo out, so don;t do it again
# Particularly important for building a pull-request
travisBuildDir = os.environ.get('TRAVIS_BUILD_DIR', None)
if travisBuildDir:
clingDir = os.path.join(srcdir, 'tools', 'cling')
os.rename(travisBuildDir, clingDir)
# Check validity and show some info
box_draw("Using Travis clone, last 5 commits:")
exec_subprocess_call('git log -5 --pretty=format:"%h <%ae> %<(60,trunc)%s"', clingDir)
print('\n')
else:
fetch_cling('master')

set_version()
if args['current_dev'] == 'tar':
if OS == 'Windows':
Expand Down
0