Skip to content

Commit cad500a

Browse files
committed
use static libstdc++ anyway
1 parent 1bc76a9 commit cad500a

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

package-arduino-preprocessor.bash

+1-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export TARGET_OS=$OS
3737

3838
START_GROUP=--Wl,--start-group
3939
END_GROUP=--Wl,--end-group
40-
EXTRA_LDFLAGS=-static-libstdc++
4140

4241
function fetch_llvm {
4342
fetched=`basename $1`
@@ -73,8 +72,6 @@ if [[ $OS == "GNU/Linux" ]] ; then
7372
fetch_llvm https://github.com/cmaglie/llvm-clang-build-scripts/releases/download/4.0.0/llvm-clang-4.0.0-ubuntu-14.04.5-i686.tar.xz
7473
elif [[ $MACHINE == "armv7l" ]] ; then
7574
OUTPUT_TAG=armhf-pc-linux-gnu
76-
#arm builds usually don't ship static libstdc++
77-
EXTRA_LDFLAGS=""
7875
fetch_llvm https://github.com/cmaglie/llvm-clang-build-scripts/releases/download/4.0.0/llvm-clang-4.0.0-linux-arm.tar.xz
7976
else
8077
echo Linux Machine not supported: $MACHINE
@@ -122,7 +119,7 @@ fi
122119
#
123120

124121
CXXFLAGS="`clang/bin/llvm-config --cxxflags` $CXXFLAGS"
125-
LDFLAGS="`clang/bin/llvm-config --ldflags` $EXTRA_LDFLAGS"
122+
LDFLAGS="`clang/bin/llvm-config --ldflags` -static-libstdc++"
126123
LLVMLIBS=`clang/bin/llvm-config --libs --system-libs`
127124
CLANGLIBS=`ls clang/lib/libclang*.a | sed s/.*libclang/-lclang/ | sed s/.a$//`
128125
SOURCES="main.cpp ArduinoDiagnosticConsumer.cpp CommandLine.cpp IdentifiersList.cpp CodeCompletion.cpp"

0 commit comments

Comments
 (0)