summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-16 17:32:51 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-16 17:32:51 +0000
commitfc4a7bd474ee6966a09dfcf3be17e385ff12db2d (patch)
tree2dd527519d3668fc9c34d762975d1b231f52aac1
parent0d1766408a7796111fb183a13c7fe033e582f95b (diff)
downloadchromium_src-fc4a7bd474ee6966a09dfcf3be17e385ff12db2d.zip
chromium_src-fc4a7bd474ee6966a09dfcf3be17e385ff12db2d.tar.gz
chromium_src-fc4a7bd474ee6966a09dfcf3be17e385ff12db2d.tar.bz2
[NaCl SDK] When running "make debug", by default use "Debug".
You can still override this by specifying "make debug CONFIG=Release". BUG=307719 R=jvoung@chromium.org, sbc@chromium.org Review URL: https://codereview.chromium.org/26644004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228938 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--native_client_sdk/src/tools/common.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk
index 5bcd02a..e8ecc5a 100644
--- a/native_client_sdk/src/tools/common.mk
+++ b/native_client_sdk/src/tools/common.mk
@@ -101,9 +101,14 @@ else # TOOLCHAIN is valid...
#
# The SDK provides two sets of libraries, Debug and Release. Debug libraries
# are compiled without optimizations to make debugging easier. By default
-# this will build a Release configuration.
+# this will build a Release configuration. When debugging via "make debug",
+# build the debug configuration by default instead.
#
+ifneq (,$(findstring debug,$(MAKECMDGOALS)))
+CONFIG ?= Debug
+else
CONFIG ?= Release
+endif
#