Selaa lähdekoodia

Add back LDFLAGS=-stdlib=libc++

Bryan Drewery 7 vuotta sitten
vanhempi
commit
7ec2ee67f2
1 muutettua tiedostoa jossa 1 lisäystä ja 1 poistoa
  1. 1 1
      .travis.yml

+ 1 - 1
.travis.yml

@@ -24,7 +24,7 @@ before_install:
   - if [ "$CXX" = "clang++" ]; then sudo cp libcxxabi/lib/libc++abi.so.1.0 /usr/lib/; fi
   - if [ "$CXX" = "clang++" ]; then sudo ln -sf libc++abi.so.1.0 /usr/lib/libc++abi.so; fi
   - if [ "$CXX" = "clang++" ]; then sudo ln -sf libc++abi.so.1.0 /usr/lib/libc++abi.so.1; fi
-  - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++" CPPUNIT_CFLAGS="-stdlib=libc++" LDFLAGS="-lc++abi"; fi
+  - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="-stdlib=libc++" CPPUNIT_CFLAGS="-stdlib=libc++" LDFLAGS="-stdlib=libc++ -lc++abi"; fi
   - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
   - (wget http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz && tar -zxvf cppunit-1.14.0.tar.gz && cd cppunit-1.14.0 && ./configure --prefix=/usr --disable-doc --disable-doxygen --disable-html-docs && make -j2 V=1 && sudo make install)
   - export CPPFLAGS="-D_FORTIFY_SOURCE=2"