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

Fix git lldb build #9263

Merged
merged 1 commit into from
Dec 7, 2014
Merged

Fix git lldb build #9263

merged 1 commit into from
Dec 7, 2014

Conversation

Keno
Copy link
Member

@Keno Keno commented Dec 7, 2014

LLVM_LLDB_TAR should only be set if we're not pulling from git. Also add a couple of comments to show which if the endif corresponds to since I found that confusing in fixing this. cc @maleadt to make sure this doesn't break his use case. Fixes an issue brought up in JuliaInterop/Cxx.jl#4

@tkelman
Copy link
Contributor

tkelman commented Dec 7, 2014

I've found all those ifeqs really tricky to keep track of too, the comments do help. LGTM, the AppVeyor failure is due to status.julialang.org being down (cc @staticfloat)

Keno added a commit that referenced this pull request Dec 7, 2014
@Keno Keno merged commit 02da29c into master Dec 7, 2014
@ivarne ivarne deleted the kf/lldbfix branch December 7, 2014 20:42
@maleadt
Copy link
Member

maleadt commented Dec 8, 2014

Thanks for the CC. Although a fresh SVN checkout of LLVM/LLDB still doesn't build flawlessly for me (because of pthread not being linked in, as @Keno reported upstream), this PR hasn't caused any other regressions for me.

@timholy
Copy link
Sponsor Member

timholy commented Dec 8, 2014

You probably did this too, but JuliaInterop/Cxx.jl#27 (comment) helped for me.

@tkelman
Copy link
Contributor

tkelman commented Dec 13, 2014

Crap. This actually broke from-scratch windows builds, because one of the ifeqs moved around. This:

ifeq ($(USECLANG),1)
LLVM_FLAGS += --enable-cxx11
else
LLVM_CXXFLAGS += -std=c++0x
endif
ifeq ($(LLDB_DISABLE_PYTHON),1)
LLVM_CXXFLAGS += -DLLDB_DISABLE_PYTHON
endif

was formerly under an ifeq ($(BUILD_LLDB),1), now it isn't.

tkelman added a commit that referenced this pull request Dec 13, 2014
@Keno
Copy link
Member Author

Keno commented Dec 13, 2014

That's correct, those are not lldb specific. They might be llvm 3.5 specific however. What's the error message?

@tkelman
Copy link
Contributor

tkelman commented Dec 14, 2014

See http://buildbot.e.ip.saba.us:8010/builders/package_win8.1-x64/builds/52/steps/shell_2/logs/stdio for the whole log, the error was:

/home/vagrant/buildbot/slave/package_win8_1-x64/build/deps/llvm-3.3/lib/Support/raw_ostream.cpp: In member function ‘llvm::raw_ostream& llvm::raw_ostream::operator<<(double)’:
/home/vagrant/buildbot/slave/package_win8_1-x64/build/deps/llvm-3.3/lib/Support/raw_ostream.cpp:229:24: error: ‘_fpclass’ was not declared in this scope
   int fpcl = _fpclass(N);
                        ^
/home/vagrant/buildbot/slave/package_win8_1-x64/build/deps/llvm-3.3/lib/Support/raw_ostream.cpp:232:15: error: ‘_FPCLASS_NZ’ was not declared in this scope
   if (fpcl == _FPCLASS_NZ)
               ^

It's something to do with these flags, because when LLVM's configure runs we get this:

cd llvm-3.3 && \
mkdir -p build_Release && cd build_Release && \
export PATH=/home/vagrant/buildbot/slave/package_win8_1-x64/build/deps/llvm-3.3/python2_path:$PATH && \
../configure --prefix=/home/vagrant/buildbot/slave/package_win8_1-x64/build/usr --build=x86_64-pc-cygwin --libdir=/home/vagrant/buildbot/slave/package_win8_1-x64/build/usr/lib --host=x86_64-w64-mingw32 LDFLAGS=-Wl,--stack,8388608 F77="x86_64-w64-mingw32-gfortran -march=x86-64 -m64" CC="x86_64-w64-mingw32-gcc -march=x86-64 -m64" CXX="x86_64-w64-mingw32-g++ -march=x86-64 -m64"  --disable-profiling --enable-shared --enable-static --enable-targets=host --disable-bindings --disable-docs --disable-assertions --enable-optimized --with-extra-ld-options="-Wl,--stack,8388608" LDFLAGS="" --disable-shared --disable-threads CXXFLAGS=" -std=c++0x" CPPFLAGS=" -D__USING_SJLJ_EXCEPTIONS__ -D__CRT__NO_INLINE" --with-python="/usr/bin/python"
../configure: line 1991: -std=c++0x: command not found

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.

None yet

4 participants