From: Michael Wagner <info@wagnertech.de>
Date: Wed, 24 Mar 2021 19:46:28 +0000 (+0100)
Subject: cpp32
X-Git-Tag: eldk-5.0_5.0-1
X-Git-Url: http://wagnertech.de/git?p=cross.git;a=commitdiff_plain;h=9199cc123e4443c9627180a2f493a4a6609dd166

cpp32
---

diff --git a/debian/eldk-5.0.cp b/debian/eldk-5.0.cp
index bafc801..4b34bca 100755
--- a/debian/eldk-5.0.cp
+++ b/debian/eldk-5.0.cp
@@ -1,6 +1,9 @@
 #!/bin/bash
 
+mkdir -p $1/opt/eldk-5.0
+rsync -a ../build/eldk-5.0/armv5te $1/opt/eldk-5.0
 mkdir -p $1/opt/cross/eldk-5.0
-rsync -a ../build/eldk-5.0/armv5te $1/opt/cross/eldk-5.0
 cp eldk-5.0/toolset.cmake $1/opt/cross/eldk-5.0/
 cp eldk-5.0/setenv.sh $1/opt/cross/eldk-5.0/
+ln -s /opt/eldk-5.0/armv5te $1/opt/cross/eldk-5.0/
+
diff --git a/eldk-5.0/toolset.cmake b/eldk-5.0/toolset.cmake
index 3dac072..958af67 100644
--- a/eldk-5.0/toolset.cmake
+++ b/eldk-5.0/toolset.cmake
@@ -1,17 +1,17 @@
 # Define our host system
 SET(CMAKE_SYSTEM_NAME Linux)
 SET(CMAKE_SYSTEM_VERSION 1)# Define the cross compiler locations
-SET(CMAKE_C_COMPILER   /opt/cross/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-gcc)
-SET(CMAKE_CXX_COMPILER /opt/cross/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-g++)
-SET(CMAKE_FIND_ROOT_PATH /opt/cross/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/)
+SET(CMAKE_C_COMPILER   /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-gcc)
+SET(CMAKE_CXX_COMPILER /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-g++)
+SET(CMAKE_FIND_ROOT_PATH /opt/eldk-5.0/armv5te/sysroots/i686-oesdk-linux/)
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 # Search for libraries and headers in the target directories only
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 add_definitions(-Wall)
-set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -D_ARMEL --sysroot=/opt/cross/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
-set( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} --sysrooot=/opt/cross/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
-set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Icross/include -Icross/arm-linux-gnueabi/include" )
-link_directories(${CMAKE_HOME_DIRECTORY}/cross/arm-linux-gnueabi/lib)
+set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -D_ARMEL --sysroot=/opt/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
+set( CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} --sysrooot=/opt/eldk-5.0/armv5te/sysroots/arm-linux-gnueabi/" )
+set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Icross/include -Icross/armv5te-linux-gnueabi/include" )
+link_directories(${CMAKE_HOME_DIRECTORY}/cross/armv5te-linux-gnueabi/lib)