Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 582948
Collapse All | Expand All

(-)a/mkspecs/common/clang.conf (-1 lines)
Lines 16-22 QMAKE_LINK_SHLIB = $$QMAKE_CXX Link Here
16
CONFIG                 += clang_pch_style
16
CONFIG                 += clang_pch_style
17
QMAKE_PCH_OUTPUT_EXT    = .pch
17
QMAKE_PCH_OUTPUT_EXT    = .pch
18
18
19
QMAKE_CFLAGS_ISYSTEM             = -isystem
20
QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
19
QMAKE_CFLAGS_PRECOMPILE          = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
21
QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
20
QMAKE_CFLAGS_USE_PRECOMPILE      = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
22
QMAKE_CFLAGS_LTCG                = -flto
21
QMAKE_CFLAGS_LTCG                = -flto
(-)a/mkspecs/common/gcc-base.conf (-1 lines)
Lines 44-50 QMAKE_CFLAGS_DEBUG += -g Link Here
44
QMAKE_CFLAGS_SHLIB         += -fPIC
44
QMAKE_CFLAGS_SHLIB         += -fPIC
45
QMAKE_CFLAGS_STATIC_LIB    += -fPIC
45
QMAKE_CFLAGS_STATIC_LIB    += -fPIC
46
QMAKE_CFLAGS_APP           += -fPIC
46
QMAKE_CFLAGS_APP           += -fPIC
47
QMAKE_CFLAGS_ISYSTEM        = -isystem
48
QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
47
QMAKE_CFLAGS_YACC          += -Wno-unused -Wno-parentheses
49
QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
48
QMAKE_CFLAGS_HIDESYMS      += -fvisibility=hidden
50
QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
49
QMAKE_CFLAGS_EXCEPTIONS_OFF += -fno-exceptions
(-)a/mkspecs/linux-icc/qmake.conf (-1 lines)
Lines 21-27 QMAKE_CFLAGS_DEBUG = -O0 -g Link Here
21
QMAKE_CFLAGS_SHLIB      = -fPIC
21
QMAKE_CFLAGS_SHLIB      = -fPIC
22
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
22
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
23
QMAKE_CFLAGS_YACC       =
23
QMAKE_CFLAGS_YACC       =
24
QMAKE_CFLAGS_ISYSTEM    = -isystem
25
QMAKE_CFLAGS_THREAD     = -D_REENTRANT
24
QMAKE_CFLAGS_THREAD     = -D_REENTRANT
26
QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
25
QMAKE_CFLAGS_SPLIT_SECTIONS = -ffunction-sections
27
QMAKE_CFLAGS_LTCG       = -ipo -fno-fat-lto-objects
26
QMAKE_CFLAGS_LTCG       = -ipo -fno-fat-lto-objects
(-)a/qmake/generators/unix/unixmake2.cpp (-11 / +3 lines)
Lines 180-195 UnixMakefileGenerator::writeMakeParts(QTextStream &t) Link Here
180
    t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
180
    t << "CXXFLAGS      = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
181
    t << "INCPATH       =";
181
    t << "INCPATH       =";
182
    {
182
    {
183
        QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
184
        const ProStringList &incs = project->values("INCLUDEPATH");
183
        const ProStringList &incs = project->values("INCLUDEPATH");
185
        for(int i = 0; i < incs.size(); ++i) {
184
        for(int i = 0; i < incs.size(); ++i) {
186
            const ProString &inc = incs.at(i);
185
            const ProString &inc = incs.at(i);
187
            if (inc.isEmpty())
186
            if (!inc.isEmpty())
188
                continue;
189
190
            if (!isystem.isEmpty() && isSystemInclude(inc.toQString()))
191
                t << ' ' << isystem << ' ';
192
            else
193
                t << " -I";
187
                t << " -I";
194
            t << escapeFilePath(inc);
188
            t << escapeFilePath(inc);
195
        }
189
        }
Lines 1332-1341 void UnixMakefileGenerator::init2() Link Here
1332
    }
1326
    }
1333
1327
1334
    if (include_deps && project->isActiveConfig("gcc_MD_depends")) {
1328
    if (include_deps && project->isActiveConfig("gcc_MD_depends")) {
1335
        // use -MMD if we know about -isystem too
1329
        project->values("QMAKE_CFLAGS") += "-MD";
1336
        ProString MD_flag(project->values("QMAKE_CFLAGS_ISYSTEM").isEmpty() ? "-MD" : "-MMD");
1330
        project->values("QMAKE_CXXFLAGS") += "-MD";
1337
        project->values("QMAKE_CFLAGS") += MD_flag;
1338
        project->values("QMAKE_CXXFLAGS") += MD_flag;
1339
    }
1331
    }
1340
}
1332
}
1341
1333
(-)a/qmake/generators/win32/mingw_make.cpp (-7 / +1 lines)
Lines 254-270 void MingwMakefileGenerator::writeIncPart(QTextStream &t) Link Here
254
{
254
{
255
    t << "INCPATH       = ";
255
    t << "INCPATH       = ";
256
256
257
    QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
258
    const ProStringList &incs = project->values("INCLUDEPATH");
257
    const ProStringList &incs = project->values("INCLUDEPATH");
259
    for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) {
258
    for (ProStringList::ConstIterator incit = incs.begin(); incit != incs.end(); ++incit) {
260
        QString inc = (*incit).toQString();
259
        QString inc = (*incit).toQString();
261
        inc.replace(QRegExp("\\\\$"), "");
260
        inc.replace(QRegExp("\\\\$"), "");
262
261
        t << "-I" << escapeFilePath(inc) << ' ';
263
        if (!isystem.isEmpty() && isSystemInclude(inc))
264
            t << isystem << ' ';
265
        else
266
            t << "-I";
267
        t << escapeFilePath(inc) << ' ';
268
    }
262
    }
269
    t << endl;
263
    t << endl;
270
}
264
}

Return to bug 582948