diff options
author | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 20:16:00 +0000 |
---|---|---|
committer | mmentovai@google.com <mmentovai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-18 20:16:00 +0000 |
commit | c9b778d207b070669f1071ee8b7ed4a81b29f6cb (patch) | |
tree | ffdeece3bc432960468b3e3fcedc4726bf96cd89 /build | |
parent | 80179e1130f6549bed35468c5f2c41534d6b2972 (diff) | |
download | chromium_src-c9b778d207b070669f1071ee8b7ed4a81b29f6cb.zip chromium_src-c9b778d207b070669f1071ee8b7ed4a81b29f6cb.tar.gz chromium_src-c9b778d207b070669f1071ee8b7ed4a81b29f6cb.tar.bz2 |
Add more useful settings to the xcconfigs.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/common.xcconfig | 5 | ||||
-rw-r--r-- | build/debug.xcconfig | 7 | ||||
-rw-r--r-- | build/executable.xcconfig | 28 | ||||
-rw-r--r-- | build/release.xcconfig | 4 | ||||
-rw-r--r-- | build/staticlib.xcconfig | 32 |
5 files changed, 73 insertions, 3 deletions
diff --git a/build/common.xcconfig b/build/common.xcconfig index 910982b..f97ddb6 100644 --- a/build/common.xcconfig +++ b/build/common.xcconfig @@ -28,11 +28,14 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ALWAYS_SEARCH_USER_PATHS = NO +GCC_C_LANGUAGE_STANDARD = c99 GCC_CW_ASM_SYNTAX = NO GCC_DYNAMIC_NO_PIC = YES GCC_ENABLE_PASCAL_STRINGS = NO GCC_INLINES_ARE_PRIVATE_EXTERN = YES +GCC_PRECOMPILE_PREFIX_HEADER = YES GCC_SYMBOLS_PRIVATE_EXTERN = YES +OTHER_LDFLAGS = $(OTHER_LDFLAGS) $(CODECOVERAGE_OTHER_LDFLAGS) PREBINDING = NO // Each project file must set XCODEPROJ_DEPTH as a project-wide setting. It @@ -43,4 +46,4 @@ PREBINDING = NO SYMROOT = $(XCODEPROJ_DEPTH)/xcodebuild USE_HEADERMAP = NO -WARNING_CFLAGS = -Wall +WARNING_CFLAGS = $(WARNING_CFLAGS) -Wall -Wendif-labels -Wnewline-eof diff --git a/build/debug.xcconfig b/build/debug.xcconfig index 0fd2c21..8a22ce8 100644 --- a/build/debug.xcconfig +++ b/build/debug.xcconfig @@ -30,5 +30,10 @@ #include "common.xcconfig" COPY_PHASE_STRIP = NO +GCC_GENERATE_TEST_COVERAGE_FILES = YES +GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES GCC_OPTIMIZATION_LEVEL = 0 -GCC_PREPROCESSOR_DEFINITIONS = DEBUG +GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) DEBUG _GLIBCXX_CONCEPT_CHECKS _GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC +OTHER_CFLAGS = $(OTHER_CFLAGS) -fstack-protector -fstack-protector-all + +CODECOVERAGE_OTHER_LDFLAGS = -lgcov diff --git a/build/executable.xcconfig b/build/executable.xcconfig new file mode 100644 index 0000000..2793edd --- /dev/null +++ b/build/executable.xcconfig @@ -0,0 +1,28 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/build/release.xcconfig b/build/release.xcconfig index 71aaf95..a7190e8 100644 --- a/build/release.xcconfig +++ b/build/release.xcconfig @@ -31,4 +31,6 @@ DEAD_CODE_STRIPPING = YES DEBUG_INFORMATION_FORMAT = dwarf-with-dsym -GCC_PREPROCESSOR_DEFINITIONS = NDEBUG +DEPLOYMENT_POSTPROCESSING = YES +GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) NDEBUG +STRIP_STYLE = all diff --git a/build/staticlib.xcconfig b/build/staticlib.xcconfig new file mode 100644 index 0000000..67fe521 --- /dev/null +++ b/build/staticlib.xcconfig @@ -0,0 +1,32 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +DEPLOYMENT_POSTPROCESSING = NO +STRIP_STYLE = debugging +CODECOVERAGE_OTHER_LDFLAGS = |