gnu: Remove CMAKE_SYSTEM_PROCESSOR from packages.

* gnu/packages/assembly.scm (cpu-features): Remove -DCMAKE_SYSTEM_PROCESSOR
flag when cross compiling
* gnu/packages/image.scm (libjpeg-turbo): Same.

Change-Id: Iaa344b7c45d4fa423765df8a6022adb584724feb
Signed-off-by: Greg Hogan <code@greghogan.com>

2 files changed, 2 insertions, 38 deletions

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 19c8fdd9466..29e98a3a0c4 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -749,24 +749,7 @@ files.")
      (list
       #:tests? #f ;; XXX: insists on using bundled googletest
       #:configure-flags
-      #~(list "-DBUILD_SHARED_LIBS=ON"
-              #$@(let ((target (%current-target-system)))
-                   (if target
-                       (cond ((string-prefix? "arm" target)
-                              '("-DCMAKE_SYSTEM_PROCESSOR=arm"))
-                             ((string-prefix? "aarch64" target)
-                              '("-DCMAKE_SYSTEM_PROCESSOR=aarch64"))
-                             ((string-prefix? "i686" target)
-                              '("-DCMAKE_SYSTEM_PROCESSOR=x86"))
-                             ((string-prefix? "x86_64" target)
-                              '("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
-                             ;; 32-bit and 64-bit
-                             ((string-prefix? "powerpc" target)
-                              '("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
-                             ((string-prefix? "riscv64" target)
-                              '("-DCMAKE_SYSTEM_PROCESSOR=riscv64"))
-                             (else '()))
-                       '())))))
+      #~(list "-DBUILD_SHARED_LIBS=ON")))
     (home-page "https://github.com/google/cpu_features")
     (synopsis "Cross platform C99 library to get cpu features at runtime")
     (description
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 6c518b5e816..ca9b46d3e62 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1994,26 +1994,7 @@ is hereby granted."))))
                #$@(if (or (target-ppc32?)
                           (target-riscv64?))
                       '("-DFLOATTEST=NO")
-                      '())
-               ;; The build system probes for the current CPU, but
-               ;; that fails when cross-compiling.
-               #$@(let ((target (%current-target-system)))
-                    (if target
-                        (cond ((string-prefix? "arm" target)
-                               '("-DCMAKE_SYSTEM_PROCESSOR=arm"))
-                              ((string-prefix? "aarch64" target)
-                               '("-DCMAKE_SYSTEM_PROCESSOR=aarch64"))
-                              ((string-prefix? "i686" target)
-                               '("-DCMAKE_SYSTEM_PROCESSOR=x86"))
-                              ((string-prefix? "x86_64" target)
-                               '("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
-                              ;; 32-bit and 64-bit
-                              ((string-prefix? "powerpc" target)
-                               '("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
-                              ((string-prefix? "riscv64" target)
-                               '("-DCMAKE_SYSTEM_PROCESSOR=riscv64"))
-                              (else '()))
-                        '())))))
+                      '()))))
     (home-page "https://libjpeg-turbo.org/")
     (synopsis "SIMD-accelerated JPEG image handling library")
     (description "libjpeg-turbo is a JPEG image codec that accelerates baseline