diff options
| author | Dmitry Safonov <dsafonov@virtuozzo.com> | 2017-05-31 23:23:39 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@virtuozzo.com> | 2017-06-14 09:48:43 +0300 |
| commit | 37b3e5953b484d2eb5e27b79a80c83bcd24baafd (patch) | |
| tree | b4f82270ebded98e9c5ae5bc29a0089eefbe5a84 /Makefile.config | |
| parent | f32ffdef90839be9fe6f50c65404217395149452 (diff) | |
ia32/feature-test: Don't check i686 libraries presence
I was adapting CRIU with ia32 support for building with Koji,
and found that Koji can't build x86_64 packages and have
i686 libs installed.
While at it, I found that i686 libraries requirement is
no longer valid since I've deleted the second parasite.
Drop feature test for i686 libs and put test for gcc.
That will effectively test if gcc can compile 32-bit code
and bug with debian's gcc (#315).
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'Makefile.config')
| -rw-r--r-- | Makefile.config | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.config b/Makefile.config index ec6c2d145..0e557805c 100644 --- a/Makefile.config +++ b/Makefile.config @@ -21,12 +21,14 @@ $(CONFIG_FILE): ifeq ($(SRCARCH),x86) # CONFIG_COMPAT is only for x86 now, no need for compile-test other archs -ifeq ($(call try-cc,$(FEATURE_TEST_X86_COMPAT),-m32),true) +ifeq ($(call try-asm,$(FEATURE_TEST_X86_COMPAT)),true) export CONFIG_COMPAT := y FEATURE_DEFINES += -DCONFIG_COMPAT else - $(info Note: Building without ia32 C/R, missed package(s):) - $(info $(info) libc6-dev-i386 and/or gcc-multilib) + $(info Note: Building without ia32 C/R, missed ia32 support in gcc) + $(info $(info) That may be related to missing gcc-multilib in your) + $(info $(info) distribution or you may have Debian with buggy toolchain) + $(info $(info) (issue https://github.com/xemul/criu/issues/315)) endif endif |