summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-02-27 07:47:39 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-02-27 07:47:39 -0500
commit2bf9ff72a84b921a55c8a7888e2bab412d0e47f3 (patch)
treeb61d99a822f026b34f09aff65838f298e6e9f6b7
parent8bc49002d2e8b0fa012cd7e659bfcfc01726a241 (diff)
downloadhtml5ks-2bf9ff72a84b921a55c8a7888e2bab412d0e47f3.tar.xz
html5ks-2bf9ff72a84b921a55c8a7888e2bab412d0e47f3.zip
do... stuff
-rwxr-xr-x.travis.sh2
-rw-r--r--.travis.yml2
m---------Modernizr0
3 files changed, 1 insertions, 3 deletions
diff --git a/.travis.sh b/.travis.sh
index a0dc3d4..85463a2 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,8 +2,6 @@
set -e -x
-MAKEOPTS="-j`nproc` ${MAKEOPTS}"
-
case "$1" in
before_install)
sudo service postgresql stop
diff --git a/.travis.yml b/.travis.yml
index b45d720..0b671bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: c
python: "3.3"
node_js: "0.11"
-env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" MAKEOPTS="-s"
+env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe" MAKEOPTS="-s -j4"
before_install: ./.travis.sh before_install
install: ./.travis.sh install
script: ./.travis.sh script
diff --git a/Modernizr b/Modernizr
-Subproject 96b3e677965b33e4af227d573da69775f2ad480
+Subproject 8a5b7a95bf03bef04f0917ce3fa36f633017863