From ed7872edee0e3207ce08e9f7294b97dabe623088 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Sat, 19 Nov 2016 22:30:33 -0500 Subject: [PATCH] [many]linux-(x86|x64)/: toolchain: Fix ASM compiler Similarly to the linux-x86 toolchain, gcc is used to compile assembler file. --- linux-x64/Toolchain.cmake | 2 +- manylinux-x64/Toolchain.cmake | 2 +- manylinux-x86/Toolchain.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-x64/Toolchain.cmake b/linux-x64/Toolchain.cmake index ac0060f..3ed842f 100644 --- a/linux-x64/Toolchain.cmake +++ b/linux-x64/Toolchain.cmake @@ -6,6 +6,6 @@ set(cross_triple "x86_64-linux-gnu") set(CMAKE_C_COMPILER /usr/bin/${cross_triple}-gcc) set(CMAKE_CXX_COMPILER /usr/bin/${cross_triple}-g++) -set(CMAKE_ASM_COMPILER /usr/bin/${cross_triple}-as) +set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop) diff --git a/manylinux-x64/Toolchain.cmake b/manylinux-x64/Toolchain.cmake index ef7cd91..33435c5 100644 --- a/manylinux-x64/Toolchain.cmake +++ b/manylinux-x64/Toolchain.cmake @@ -6,7 +6,7 @@ set(cross_triple "x86_64-linux-gnu") set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++) -set(CMAKE_ASM_COMPILER /opt/rh/devtoolset-2/root/usr/bin/as) +set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran) set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop) diff --git a/manylinux-x86/Toolchain.cmake b/manylinux-x86/Toolchain.cmake index bebd7f5..1abfb14 100644 --- a/manylinux-x86/Toolchain.cmake +++ b/manylinux-x86/Toolchain.cmake @@ -6,7 +6,7 @@ set(cross_triple "i686-linux-gnu") set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++) -set(CMAKE_ASM_COMPILER /opt/rh/devtoolset-2/root/usr/bin/as) +set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran) # Discard path returned by pkg-config and associated with HINTS in module