浏览代码

one more try to get -m32 (rel #149)

Stasik0 10 年之前
父节点
当前提交
33f5aa86c1
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      .travis.yml

+ 5 - 5
.travis.yml

@@ -17,17 +17,17 @@ addons:
     build_command: make
     branch_pattern: coverity_scan
 before_install:
-   - sudo apt-get install libc6-i386 libc6-dev-i386
    - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
    - sudo add-apt-repository ppa:kalakris/cmake -y
    - sudo apt-get update -qq
-   - sudo apt-get install -qq gcc-4.8
+   #- sudo apt-get install -qq gcc-4.8
    - sudo apt-get install -qq --no-install-recommends build-essential cmake python-lxml graphviz doxygen wget
+   - sudo apt-get install libc6-i386 libc6-dev-i386
    - wget http://security.ubuntu.com/ubuntu/pool/main/c/check/check_0.9.10-6ubuntu3_amd64.deb
    - sudo dpkg -i check_0.9.10-6ubuntu3_amd64.deb
    - sudo pip install cpp-coveralls
-   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20
-   - sudo update-alternatives --config gcc
+   #- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20
+   #- sudo update-alternatives --config gcc
 script: 
    - echo "Checking the applicability of patches"
    - ./tools/.checkPorts.sh
@@ -39,7 +39,7 @@ script:
    - make
    - cd .. && rm build -rf && mkdir -p build && cd build
    - echo "Debug build and unit tests (32 bit) 
-   - CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNIT_TESTS=ON -DENABLE_COVERAGE=ON ..  
+   - CFLAGS=-m32 CXXFLAGS=-m32 cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_UNIT_TESTS=ON -DENABLE_COVERAGE=ON ..  
    - make && make test
    - cd .. && rm build -rf && mkdir -p build && cd build
    - cmake -DGENERATE_DOCUMENTATION=ON ..