diff options
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index 0966a2e55..8bba8f95e 100755 --- a/debian/rules +++ b/debian/rules | |||
| @@ -19,8 +19,10 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) | |||
| 19 | 19 | ||
| 20 | ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) | 20 | ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) |
| 21 | confflags += --build=$(DEB_HOST_GNU_TYPE) | 21 | confflags += --build=$(DEB_HOST_GNU_TYPE) |
| 22 | CC := gcc | ||
| 22 | else | 23 | else |
| 23 | confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) | 24 | confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) |
| 25 | CC := $(DEB_HOST_GNU_TYPE)-gcc | ||
| 24 | endif | 26 | endif |
| 25 | 27 | ||
| 26 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) | 28 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) |
| @@ -125,7 +127,7 @@ endif | |||
| 125 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h | 127 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h |
| 126 | 128 | ||
| 127 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' | 129 | $(MAKE) -C build-deb -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' |
| 128 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='gcc $(OPTFLAGS) -g -Wall' | 130 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(OPTFLAGS) -g -Wall' |
| 129 | $(MAKE) -C debian/tests | 131 | $(MAKE) -C debian/tests |
| 130 | 132 | ||
| 131 | touch build-deb-stamp | 133 | touch build-deb-stamp |