From 1f808a1d1d042955e98eb92d09e1b6b8154315e9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 14 Sep 2012 16:04:59 +0200 Subject: Introduce an option to disable stripping during installation The default is the current behaviour: strip on installing release, no strip on installing debug. This option does not change the installation of debug builds because qmake does not support that. Change-Id: Ic208d5ffe860d5f1ee1cafdc944e12001673d33f Reviewed-by: Davide Pesavento Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 2fb9f27f13..251fdfe152 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -200,6 +200,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "PROCESS" ] = "partial"; dictionary[ "WIDGETS" ] = "yes"; dictionary[ "RTTI" ] = "yes"; + dictionary[ "STRIP" ] = "yes"; dictionary[ "SSE2" ] = "auto"; dictionary[ "SSE3" ] = "auto"; dictionary[ "SSSE3" ] = "auto"; @@ -809,6 +810,11 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-no-rtti") dictionary[ "RTTI" ] = "no"; + else if (configCmdLine.at(i) == "-strip") + dictionary[ "STRIP" ] = "yes"; + else if (configCmdLine.at(i) == "-no-strip") + dictionary[ "STRIP" ] = "no"; + else if (configCmdLine.at(i) == "-accessibility") dictionary[ "ACCESSIBILITY" ] = "yes"; else if (configCmdLine.at(i) == "-no-accessibility") { @@ -1741,7 +1747,10 @@ bool Configure::displayHelp() desc("PROCESS", "no", "-dont-process", "Do not generate Makefiles/Project files. This will override -no-fast if specified.\n"); desc("RTTI", "no", "-no-rtti", "Do not compile runtime type information."); - desc("RTTI", "yes", "-rtti", "Compile runtime type information.\n"); + desc("RTTI", "yes", "-rtti", "Compile runtime type information."); + desc("STRIP", "no", "-no-strip", "Do not strip libraries and executables of debug info when installing."); + desc("STRIP", "yes", "-strip", "Strip libraries and executables of debug info when installing.\n"); + desc("SSE2", "no", "-no-sse2", "Do not compile with use of SSE2 instructions."); desc("SSE2", "yes", "-sse2", "Compile with use of SSE2 instructions."); desc("SSE3", "no", "-no-sse3", "Do not compile with use of SSE3 instructions."); @@ -2711,6 +2720,8 @@ void Configure::generateCachefile() moduleStream << " neon"; if (dictionary[ "LARGE_FILE" ] == "yes") moduleStream << " largefile"; + if (dictionary[ "STRIP" ] == "no") + moduleStream << " nostrip"; moduleStream << endl; moduleStream.flush(); -- cgit v1.2.3