.travis.yml: cleanup ARCH configuration

.travis.yml

@@ -6,11 +6,13 @@ compiler:
 
 env:
   matrix:
-    - CONF=debug ARCH=x86_64 ARCH_FLAGS=""
-    - CONF=release ARCH=x86_64 ARCH_FLAGS=""
-    - CONF=debug ARCH=x86 ARCH_FLAGS="-m32"
-    - CONF=release ARCH=x86 ARCH_FLAGS="-m32"
+    - CONF=debug   ARCH=x86_64
+    - CONF=release ARCH=x86_64
+    - CONF=debug   ARCH=x86
+    - CONF=release ARCH=x86
   global:
+    - ARCH_FLAGS_x86='-m32'
+    - ARCH_FLAGS_x86_64=''
     - GITHUB_REPO='miloyip/rapidjson'
     - secure: "HrsaCb+N66EG1HR+LWH1u51SjaJyRwJEDzqJGYMB7LJ/bfqb9mWKF1fLvZGk46W5t7TVaXRDD5KHFx9DPWvKn4gRUVkwTHEy262ah5ORh8M6n/6VVVajeV/AYt2C0sswdkDBDO4Xq+xy5gdw3G8s1A4Inbm73pUh+6vx+7ltBbk="
 
@@ -24,6 +26,7 @@ before_script:
     - sed -i 's/march=native/msse4.2/' CMakeLists.txt
     - mkdir build 
     - >
+        eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}"
         (cd build && cmake 
         -DRAPIDJSON_HAS_STDSTRING=ON
         -DCMAKE_VERBOSE_MAKEFILE=ON