diff options
| author | Philipp A. Hartmann <pah@qo.cx> | 2015-03-24 23:04:38 +0300 |
|---|---|---|
| committer | Philipp A. Hartmann <pah@qo.cx> | 2015-03-24 23:04:38 +0300 |
| commit | 107aff0c2822c74893abe24d4dbc1c85b30129e4 (patch) | |
| tree | 3c6411e1735353cbded7345cb7dde100a84b3963 /.travis.yml | |
| parent | 3a4835e080d213c60842f58f207991fbb1c97f74 (diff) | |
.travis.yml: disable SSE4.2 on 32-bit (closes #266)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 54f9d909..ac7240d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ env: - CONF=debug ARCH=x86 - CONF=release ARCH=x86 global: - - ARCH_FLAGS_x86='-m32' - - ARCH_FLAGS_x86_64='' + - ARCH_FLAGS_x86='-m32' # #266: don't use SSE on 32-bit + - ARCH_FLAGS_x86_64='-msse4.2' # use SSE4.2 on 64-bit - GITHUB_REPO='miloyip/rapidjson' - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk=" @@ -26,7 +26,7 @@ install: true before_script: # hack to avoid Valgrind bug (https://bugs.kde.org/show_bug.cgi?id=326469), # exposed by merging PR#163 (using -march=native) - - sed -i 's/march=native/msse4.2/' CMakeLists.txt + - sed -i "s/-march=native//" CMakeLists.txt - mkdir build - > eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ; |