diff --git a/.travis.yml b/.travis.yml index 9cddab2..16af08a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,9 @@ matrix: dist: xenial sudo: required go: 1.6 - env: CC="gcc-5" CXX="g++-5" OS="linux" + env: CC="gcc-5" CXX="g++-5" OS="linux" CGO_LDFLAGS_ALLOW="-z|noexecstack" - os: osx + env: CGO_LDFLAGS_ALLOW="-z|noexecstack" install: - go get -u github.com/smartystreets/goconvey diff --git a/datachannel.go b/datachannel.go index 651f6d0..217be8c 100644 --- a/datachannel.go +++ b/datachannel.go @@ -8,7 +8,8 @@ package webrtc /* #cgo CXXFLAGS: -std=c++0x -#cgo LDFLAGS: -L${SRCDIR}/lib +#cgo linux LDFLAGS: -L${SRCDIR}/lib -z noexecstack +#cgo darwin LDFLAGS: -L${SRCDIR}/lib #cgo android pkg-config: webrtc-android-armeabi-v7a.pc #cgo linux,arm pkg-config: webrtc-linux-arm.pc #cgo linux,386 pkg-config: webrtc-linux-386.pc diff --git a/peerconnection.go b/peerconnection.go index e1f1726..37f2d47 100644 --- a/peerconnection.go +++ b/peerconnection.go @@ -31,7 +31,8 @@ package webrtc /* #cgo CXXFLAGS: -std=c++0x -#cgo LDFLAGS: -L${SRCDIR}/lib +#cgo linux LDFLAGS: -L${SRCDIR}/lib -z noexecstack +#cgo darwin LDFLAGS: -L${SRCDIR}/lib #cgo android pkg-config: webrtc-android-armeabi-v7a.pc #cgo linux,arm pkg-config: webrtc-linux-arm.pc #cgo linux,386 pkg-config: webrtc-linux-386.pc