From dec480ab3f0809677ba3ef2a3a64d402d742b5ec Mon Sep 17 00:00:00 2001 From: Philip Balister <philip@balister.org> Date: Mon, 28 Dec 2015 17:15:55 -0500 Subject: Fix 64 bit OpenEmbedded builds. GNU Radio is looking at files on the build system to determine if it should use the lib64 directory. This doesn't work on cross builds. Do not set REDHAT, DEBIAN, or SLACKWARE if cross compiling. Also fix gr-newmod so modules do the right thing. Signed-off-by: Philip Balister <philip@balister.org> --- gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gr-utils/python') diff --git a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake index 5b7e886f85..fbbea5fee0 100644 --- a/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake +++ b/gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake @@ -29,15 +29,15 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(LINUX TRUE) endif() -if(LINUX AND EXISTS "/etc/debian_version") +if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/debian_version") set(DEBIAN TRUE) endif() -if(LINUX AND EXISTS "/etc/redhat-release") +if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/redhat-release") set(REDHAT TRUE) endif() -if(LINUX AND EXISTS "/etc/slackware-version") +if(NOT CMAKE_CROSSCOMPILING AND LINUX AND EXISTS "/etc/slackware-version") set(SLACKWARE TRUE) endif() -- cgit v1.2.3