diff options
| author | Thiago Macieira <[email protected]> | 2016-06-14 15:14:04 -0700 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2016-06-22 17:51:20 +0000 |
| commit | 74fed1d5b779a0bd21c9d94ddcebc8f70fb48d93 (patch) | |
| tree | 02bb37cdca1e55155290b96857d963ea21464787 /src/plugins/qmakeprojectmanager/makefileparse.cpp | |
| parent | 43075f5fb165e764f11abd35c4cc06cbda969a20 (diff) | |
Fix build on PPC: PPC is defined to 1
$ powerpc-poky-linux-gcc -dM -E -xc /dev/null | grep -i PPC
#define _ARCH_PPC 1
#define __PPC__ 1
#define __PPC 1
#define PPC 1
Not on PPC64, though (only __PPC__ and __PPC64__ are defined).
Change-Id: Ib57b52598e2f452985e9fffd145812f5098e441d
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <[email protected]>
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makefileparse.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makefileparse.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index a52f22c3d4c..8b63e87f47c 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -167,12 +167,12 @@ void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments) m_config.archConfig = QMakeStepConfig::NoArch; } else if (value == QLatin1String("ppc")) { if (qa.op == QLatin1String("+=")) - m_config.archConfig = QMakeStepConfig::PPC; + m_config.archConfig = QMakeStepConfig::PowerPC; else m_config.archConfig = QMakeStepConfig::NoArch; } else if (value == QLatin1String("ppc64")) { if (qa.op == QLatin1String("+=")) - m_config.archConfig = QMakeStepConfig::PPC64; + m_config.archConfig = QMakeStepConfig::PowerPC64; else m_config.archConfig = QMakeStepConfig::NoArch; } else if (value == QLatin1String("iphonesimulator")) { |