diff options
| author | Helmut Grohne <helmut@subdivi.de> | 2018-04-28 06:36:11 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2018-04-28 06:38:17 +0000 |
| commit | a5eb0dc3c3a16d12c7a26ac42b93a35b931188d3 (patch) | |
| tree | 3cd1d44d1d108c2472709fbe28aacc812121d5b8 /lib | |
| parent | 1e385e75a4e19731e2fa603b7272778ab9d36056 (diff) | |
| download | debhelper-a5eb0dc3c3a16d12c7a26ac42b93a35b931188d3.tar.gz | |
cmake: honour CC/CXX during native builds
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Debian/Debhelper/Buildsystem/cmake.pm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index bb977e4c..b4fd82f1 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -86,6 +86,12 @@ sub configure { push(@flags, "-G${generator}"); } + if ($ENV{CC}) { + push @flags, "-DCMAKE_C_COMPILER=" . $ENV{CC}; + } + if ($ENV{CXX}) { + push @flags, "-DCMAKE_CXX_COMPILER=" . $ENV{CXX}; + } if (is_cross_compiling()) { my $deb_host = dpkg_architecture_value("DEB_HOST_ARCH_OS"); if (my $cmake_system = $DEB_HOST2CMAKE_SYSTEM{$deb_host}) { @@ -94,14 +100,10 @@ sub configure { error("Cannot cross-compile - CMAKE_SYSTEM_NAME not known for ${deb_host}"); } push @flags, "-DCMAKE_SYSTEM_PROCESSOR=" . dpkg_architecture_value("DEB_HOST_GNU_CPU"); - if ($ENV{CC}) { - push @flags, "-DCMAKE_C_COMPILER=" . $ENV{CC}; - } else { + if (not $ENV{CC}) { push @flags, "-DCMAKE_C_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-gcc"; } - if ($ENV{CXX}) { - push @flags, "-DCMAKE_CXX_COMPILER=" . $ENV{CXX}; - } else { + if (not $ENV{CXX}) { push @flags, "-DCMAKE_CXX_COMPILER=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-g++"; } push(@flags, "-DPKG_CONFIG_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config"); |