Fixed libcsptr misinstalling on appveyor builds

Snaipe · Apr 15, 2015 · 39c8dfd · 39c8dfd
1 parent 09b7bdc
commit 39c8dfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.ci/install-libcsptr.sh b/.ci/install-libcsptr.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 repo="https://github.com/Snaipe/libcsptr.git"
-tag="v2.0.1"
+tag="v2.0.2"
 
 mkdir dependencies
 git clone --branch ${tag} --depth 1 ${repo} dependencies/libcsptr &&
 (
     cd dependencies/libcsptr &&
     ./autogen.sh &&
-    ./configure --prefix=/usr &&
+    ./configure "$@" &&
     make &&
     {
         if command -v sudo; then

diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
   - sudo apt-get -qq install -y check gcc-4.9 gettext autopoint
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 90
   - sudo pip install cpp-coveralls
-  - .ci/install-libcsptr.sh
+  - .ci/install-libcsptr.sh --prefix=/usr
 script:
   - ./autogen.sh && ./configure --enable-gcov CFLAGS="-g -O0" && make && make check
 after_success:

diff --git a/appveyor.yml b/appveyor.yml
@@ -53,7 +53,7 @@ configuration: Release
 
 install:
   - 'set GCOV_PREFIX=%APPVEYOR_BUILD_FOLDER%'
-  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-libcsptr.sh"'
+  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; .ci/install-libcsptr.sh --prefix=/usr/i686-w64-mingw32 --host i686-w64-mingw32"'
   - "%CYG_BASH% -lc 'cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh'"
   - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure CC=i686-w64-mingw32-gcc CFLAGS=\"-g -O0\" --enable-gcov"'