History

add -isystem cmdline option

Joe Soroka committed 15 years ago

Commit e939c401 parent b8867742 files · +6 −1Browse files

Unified · Split

2 files
  1. libtcc.c +1 −1
  2. tcc.c +5 −0
libtcc.c+1−1
@@ -1274,7 +1274,7 @@ LIBTCCAPI int tcc_set_output_type(TCCState *s, int output_type) · 1273 unmodified lines
1274 1274
1275 if (!s->nostdinc) {1275 if (!s->nostdinc) {
1276 /* default include paths */1276 /* default include paths */
1277 /* XXX: reverse order needed if -isystem support */1277 /* -isystem paths have already been handled */
1278#ifndef TCC_TARGET_PE1278#ifndef TCC_TARGET_PE
1279 tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/local/include");1279 tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/local/include");
1280 tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/include");1280 tcc_add_sysinclude_path(s, CONFIG_SYSROOT "/usr/include");
tcc.c+5−0
@@ -111,6 +111,7 @@ enum { · 110 unmodified lines
111 TCC_OPTION_O,111 TCC_OPTION_O,
112 TCC_OPTION_m,112 TCC_OPTION_m,
113 TCC_OPTION_f,113 TCC_OPTION_f,
114 TCC_OPTION_isystem,
114 TCC_OPTION_nostdinc,115 TCC_OPTION_nostdinc,
115 TCC_OPTION_nostdlib,116 TCC_OPTION_nostdlib,
116 TCC_OPTION_print_search_dirs,117 TCC_OPTION_print_search_dirs,
@@ -161,6 +162,7 @@ static const TCCOption tcc_options[] = { · 44 unmodified lines
161 { "O", TCC_OPTION_O, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },162 { "O", TCC_OPTION_O, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
162 { "m", TCC_OPTION_m, TCC_OPTION_HAS_ARG },163 { "m", TCC_OPTION_m, TCC_OPTION_HAS_ARG },
163 { "f", TCC_OPTION_f, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },164 { "f", TCC_OPTION_f, TCC_OPTION_HAS_ARG | TCC_OPTION_NOSEP },
165 { "isystem", TCC_OPTION_isystem, TCC_OPTION_HAS_ARG },
164 { "nostdinc", TCC_OPTION_nostdinc, 0 },166 { "nostdinc", TCC_OPTION_nostdinc, 0 },
165 { "nostdlib", TCC_OPTION_nostdlib, 0 },167 { "nostdlib", TCC_OPTION_nostdlib, 0 },
166 { "print-search-dirs", TCC_OPTION_print_search_dirs, 0 }, 168 { "print-search-dirs", TCC_OPTION_print_search_dirs, 0 },
@@ -425,6 +427,9 @@ static int parse_args(TCCState *s, int argc, char **argv) · 258 unmodified lines
425 reloc_output = 1;427 reloc_output = 1;
426 output_type = TCC_OUTPUT_OBJ;428 output_type = TCC_OUTPUT_OBJ;
427 break;429 break;
430 case TCC_OPTION_isystem:
431 tcc_add_sysinclude_path(s, optarg);
432 break;
428 case TCC_OPTION_nostdinc:433 case TCC_OPTION_nostdinc:
429 s->nostdinc = 1;434 s->nostdinc = 1;
430 break;435 break;