[arch-commits] Commit in julia/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, March 28, 2017 @ 22:39:29
  Author: arojas
Revision: 219761

Fix arch mismatch on x86_64 (FS#53494)

Modified:
  julia/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-28 21:10:56 UTC (rev 219760)
+++ PKGBUILD	2017-03-28 22:39:29 UTC (rev 219761)
@@ -8,7 +8,7 @@
 pkgbase=julia
 pkgname=('julia' 'julia-docs')
 pkgver=0.5.1
-pkgrel=3
+pkgrel=4
 epoch=2
 arch=('x86_64' 'i686')
 pkgdesc='High-level, high-performance, dynamic programming language'
@@ -34,12 +34,14 @@
 
   # SSE2 is a requirement for Julia on 32-bit x86
   if [[ $CARCH == i686 ]]; then
-    export CFLAGS+=" -march=pentium4"
-    export CXXFLAGS+=" -march=pentium4"
+    export M=pentium4
+  else
+    export M="x86-64"
   fi
 
   cd julia-$pkgver
   make prefix=/usr sysconfdir=/etc \
+    MARCH=$M \
     USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \
@@ -75,13 +77,15 @@
 
   # SSE2 is a requirement for Julia on 32-bit x86
   if [[ $CARCH == i686 ]]; then
-    export CFLAGS+=" -march=pentium4"
-    export CXXFLAGS+=" -march=pentium4"
+    export M=pentium4
+  else
+    export M="x86-64"
   fi
 
   cd julia-$pkgver
   make DESTDIR="$pkgdir" \
     prefix=/usr sysconfdir=/etc  \
+    MARCH=$M \
     USE_SYSTEM_LLVM=0 \
     USE_SYSTEM_LIBUNWIND=1 \
     USE_SYSTEM_PCRE=1 \