Skip to content

Commit

Permalink
Fix 64 bit OpenEmbedded builds.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
balister committed Dec 28, 2015
1 parent 815a7cf commit dec480a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions cmake/Modules/GrPlatform.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit dec480a

Please sign in to comment.