diff options
| author | Philip Balister <philip@opensdr.com> | 2015-10-28 10:45:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-11-11 10:37:26 -0800 |
| commit | 2aa53c238559c448d65fc1112e9dfe7c80177905 (patch) | |
| tree | 45c2143ee2fe959a425284177f3429cfd96aa18a | |
| parent | dabe801be4cb571228e866e9b501edfc366f5f14 (diff) | |
| download | uhd-2aa53c238559c448d65fc1112e9dfe7c80177905.tar.gz uhd-2aa53c238559c448d65fc1112e9dfe7c80177905.tar.bz2 uhd-2aa53c238559c448d65fc1112e9dfe7c80177905.zip | |
If we are cross compiling, do not test for build machine distro.
UHD would use the result of the REDHAT test to decide if UHD installed
in lib64. So if you did a build for a 64 bit machine on a FEDORA box with
OE, it decided to install uhd in /usr/lib64. This is not always the right thing
to do.
Eventually, we will need to deal with OE builds that use lib64, but we can figure
that out when we hit the problem.
Signed-off-by: Philip Balister <philip@opensdr.com>
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 640935830..08c2a6c53 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -27,11 +27,11 @@ 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() |