diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-01-31 18:59:10 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-29 14:59:21 +0000 |
| commit | 4e9768991978dc1720ca7a61a517afd44a95ccec (patch) | |
| tree | fcab53136b31b05a222512426c6541069265a2eb | |
| parent | ade8449ea2f9c47cdf1ae778a1117029bebdda54 (diff) | |
Avoid passing QMAKE_ARCH to config.h
We don't need qmake to determine sizeof(long).
Change-Id: Iced95d685b4c82fb3925bb164691203501e395d9
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| -rw-r--r-- | 3rdparty/elfutils/config.h | 10 | ||||
| -rw-r--r-- | 3rdparty/elfutils/elfutils.pri | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/3rdparty/elfutils/config.h b/3rdparty/elfutils/config.h index ea6d41a..ce236a7 100644 --- a/3rdparty/elfutils/config.h +++ b/3rdparty/elfutils/config.h @@ -82,10 +82,12 @@ #define PACKAGE_VERSION "0.168" /* The size of `long', as computed by sizeof. */ -#if QMAKE_ARCH == 64 -#define SIZEOF_LONG 8 -#else +#ifdef __SIZEOF_LONG__ +#define SIZEOF_LONG __SIZEOF_LONG__ +#elif defined(_WIN32) #define SIZEOF_LONG 4 +#else +#error "Cannot determine SIZEOF_LONG" #endif /* Define to 1 if you have the ANSI C header files. */ @@ -119,7 +121,7 @@ #endif /* Number of bits in a file offset, on hosts where this is settable. */ -#if QMAKE_ARCH == 32 +#ifdef __i386__ #define _FILE_OFFSET_BITS 64 #endif diff --git a/3rdparty/elfutils/elfutils.pri b/3rdparty/elfutils/elfutils.pri index d080fc2..27e13b2 100644 --- a/3rdparty/elfutils/elfutils.pri +++ b/3rdparty/elfutils/elfutils.pri @@ -2,14 +2,6 @@ VERSION = 0.168 QMAKE_CFLAGS += -std=gnu99 DEFINES += HAVE_CONFIG_H _GNU_SOURCE -equals(QT_ARCH, i386) { - DEFINES += QMAKE_ARCH=32 -} - -equals(QT_ARCH, x86_64) { - DEFINES += QMAKE_ARCH=64 -} - HEADERS += \ $$PWD/version.h \ $$PWD/config.h |