summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2017-07-24 10:45:52 +0200
committerbartus2017-07-24 10:45:52 +0200
commit62cd06c0f6a3694ad30372d07a498941cead1510 (patch)
tree16ca03c042fa4958f1e13796b0a69ce8359a06b0
parent9613d635db8486dd441138aceb646aa2b4e504f7 (diff)
downloadaur-62cd06c0f6a3694ad30372d07a498941cead1510.tar.gz
fix -fno-plt flag not supported by gcc5, cuda host compiler
-rw-r--r--PKGBUILD7
1 files changed, 4 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 4ebf8a1bf4b8..9516220e2247 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,10 @@ depends=('gflags' 'suitesparse' 'freeglut' 'glew' 'google-glog' 'freeimage' 'boo
makedepends=('ceres-solver' 'boost' 'git' 'cmake' 'eigen')
optdepends=('cuda: for cuda sfm/mvs acceleration')
provides=()
-options=()
+# Fix: -fno-plt flag not supported by cuda host compiler (gcc5)
+options=(!makeflags)
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong"
+CXXFLAGS="${CFLAGS}"
install=${pkgname}.install
source=("${pkgname}::git+https://github.com/colmap/colmap.git"
"nvm-export.patch"
@@ -52,8 +55,6 @@ build() {
mkdir -p build
cd build
- #export CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe"
- #export CXXFLAGS="${CFLAGS}"
cmake -DTESTS_ENABLED=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ${_EXTRAOPTS} -DCUDA_NVCC_FLAGS="--compiler-options -fPIC" ../${pkgname}
make
}