Merge pull request #38 from qiniu/develop

x
qiniu · Apr 13, 2016 · 95b6ba6 · 95b6ba6
2 parents f6ad7b5 + 117a1d1
commit 95b6ba6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -1,2 +1,10 @@
 language: go
 sudo: false
+install:
+  - export QINIU_SRC=$HOME/gopath/src
+  - mkdir -p $QINIU_SRC/gopkg.in
+  - mv $QINIU_SRC/github.com/qiniu/iconv $QINIU_SRC/gopkg.in/iconv.v1
+  - export TRAVIS_BUILD_DIR=$QINIU_SRC/gopkg.in/iconv.v1
+script:
+  - cd $TRAVIS_BUILD_DIR
+  - go install -v ./...
diff --git a/iconv.go b/iconv.go
@@ -5,7 +5,6 @@ package iconv
 
 // #cgo darwin  LDFLAGS: -liconv
 // #cgo freebsd LDFLAGS: -liconv
-// #cgo linux   LDFLAGS: -liconv
 // #cgo windows LDFLAGS: -liconv
 // #include <iconv.h>
 // #include <stdlib.h>