From 76d24a4144aac90f167f3ff5a74b29708591e43b Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 19 Mar 2022 19:34:10 +0100 Subject: [PATCH] Remove m32 --- scripts/core/install-dependencies.sh | 3 --- scripts/core/setup-variables.sh | 5 ----- 2 files changed, 8 deletions(-) diff --git a/scripts/core/install-dependencies.sh b/scripts/core/install-dependencies.sh index 0450b7d..5463855 100755 --- a/scripts/core/install-dependencies.sh +++ b/scripts/core/install-dependencies.sh @@ -72,9 +72,6 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then echo "Creating toolchain file..." cd "$ROOT_DIR" { - echo "set(CMAKE_EXE_LINKER_FLAGS \${CMAKE_EXE_LINKER_FLAGS} ${MFLAGS})"; - echo "set(CMAKE_C_FLAGS \${CMAKE_C_FLAGS} ${MFLAGS})"; - echo "set(CMAKE_CXX_FLAGS \${CMAKE_CXX_FLAGS} ${MFLAGS})"; echo "set(CMAKE_SYSTEM_PROCESSOR ${CPU_ARCH_LINUX})"; echo "set(CMAKE_C_COMPILER ${CROSS_CC})"; echo "set(CMAKE_C_COMPILER_TARGET ${CLANG_TRIPLE})"; diff --git a/scripts/core/setup-variables.sh b/scripts/core/setup-variables.sh index a5d1d24..dceb568 100755 --- a/scripts/core/setup-variables.sh +++ b/scripts/core/setup-variables.sh @@ -72,10 +72,6 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then export CPU_CORES_NUM="4" fi - if [[ "$CPU_ARCHITECTURE_NAME" == "386" ]]; then - export MFLAGS="-m32" - fi - if [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then export CMAKE_EXTRA_ARGUMENTS_TDJNI="${CMAKE_EXTRA_ARGUMENTS_TDJNI} -DOPENSSL_USE_STATIC_LIBS=True" elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then @@ -118,7 +114,6 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then echo "CPU_COMPILATION_TOOL=${CPU_COMPILATION_TOOL}" echo "CC=${CC}" echo "CXX=${CXX}" - echo "MFLAGS=${MFLAGS}" echo "CFLAGS=${CFLAGS}" echo "CXXFLAGS=${CXXFLAGS}" echo "CMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}"