Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: tools/gn/substitution_type.cc

Issue 1326053003: port cfi to gn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable CFI when targeting nacl Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« build/config/compiler/BUILD.gn ('K') | « tools/gn/substitution_type.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/substitution_type.cc
diff --git a/tools/gn/substitution_type.cc b/tools/gn/substitution_type.cc
index 2713ee2daf4abdeabc13be42afb2bb5f37b3a642..494a907ec830d8ea417c19419264c7df2cb9d626 100644
--- a/tools/gn/substitution_type.cc
+++ b/tools/gn/substitution_type.cc
@@ -28,6 +28,7 @@ const char* kSubstitutionNames[SUBSTITUTION_NUM_TYPES] = {
"{{target_out_dir}}", // SUBSTITUTION_TARGET_OUT_DIR
"{{target_output_name}}", // SUBSTITUTION_TARGET_OUTPUT_NAME
+ "{{arflags}}", // SUBSTITUTION_ARFLAGS
"{{cflags}}", // SUBSTITUTION_CFLAGS
"{{cflags_c}}", // SUBSTITUTION_CFLAGS_C
"{{cflags_cc}}", // SUBSTITUTION_CFLAGS_CC
@@ -64,6 +65,7 @@ const char* kSubstitutionNinjaNames[SUBSTITUTION_NUM_TYPES] = {
"target_out_dir", // SUBSTITUTION_TARGET_OUT_DIR
"target_output_name", // SUBSTITUTION_TARGET_OUTPUT_NAME
+ "arflags", // SUBSTITUTION_ARFLAGS
"cflags", // SUBSTITUTION_CFLAGS
"cflags_c", // SUBSTITUTION_CFLAGS_C
"cflags_cc", // SUBSTITUTION_CFLAGS_CC
@@ -152,6 +154,7 @@ bool IsValidLinkerSubstitution(SubstitutionType type) {
return IsValidToolSubstutition(type) ||
type == SUBSTITUTION_LINKER_INPUTS ||
type == SUBSTITUTION_LINKER_INPUTS_NEWLINE ||
+ type == SUBSTITUTION_ARFLAGS ||
type == SUBSTITUTION_LDFLAGS ||
type == SUBSTITUTION_LIBS ||
type == SUBSTITUTION_OUTPUT_EXTENSION ||
« build/config/compiler/BUILD.gn ('K') | « tools/gn/substitution_type.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698