Przeglądaj źródła

ajusting toolchains for -m32

Stasik0 10 lat temu
rodzic
commit
01e673e1ef
2 zmienionych plików z 1 dodań i 19 usunięć
  1. 1 1
      .travis.yml
  2. 0 18
      cmake/Toolchain-gcc32.cmake

+ 1 - 1
.travis.yml

@@ -45,7 +45,7 @@ script:
 - cp open62541-win32.zip ..
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Cross compile release build for 32-bit linux"
-- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-gcc32.cmake -DCMAKE_BUILD_TYPE=Release
+- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-gcc-m32.cmake -DCMAKE_BUILD_TYPE=Release
   -DEXAMPLESERVER=ON ..
 - make -j
 - tar -pczf open62541-linux32.tar.gz exampleServer libopen62541.so libopen62541.a

+ 0 - 18
cmake/Toolchain-gcc32.cmake

@@ -1,18 +0,0 @@
-# the name of the target operating system
-set(CMAKE_SYSTEM_NAME Linux)
-
-# which compilers to use for C and C++
-set(CMAKE_C_COMPILER gcc)
-set(CMAKE_C_FLAGS -m32)
-set(CMAKE_CXX_COMPILER g++)
-set(CMAKE_CXX_FLAGS -m32)
-
-# here is the target environment located
-set(CMAKE_FIND_ROOT_PATH   /usr/i486-linux-gnu )
-
-# adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)