diff options
| author | obrien <obrien@FreeBSD.org> | 2002-03-02 09:58:48 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-03-02 09:58:48 +0000 |
| commit | 71fa5068bb05736698cc572c3b07a35d092a87e6 (patch) | |
| tree | 4b9e499c35391db15d35404a2a32e862939f262b /contrib | |
| parent | b95af4f5a38b3687b4909ef2e50cd209e2cafa20 (diff) | |
| download | FreeBSD-src-71fa5068bb05736698cc572c3b07a35d092a87e6.zip FreeBSD-src-71fa5068bb05736698cc572c3b07a35d092a87e6.tar.gz | |
Better granularity of the FREEBSD_NATIVE #ifdef's.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gcc/gcc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c index 7d83ff7..5aff87a 100644 --- a/contrib/gcc/gcc.c +++ b/contrib/gcc/gcc.c @@ -3846,7 +3846,8 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" case OBJFMT_UNKNOWN: fatal ("object format unknown"); } -#else /* not FREEBSD_NATIVE */ +#endif /* FREEBSD_NATIVE */ +#ifndef FREEBSD_NATIVE #ifndef OS2 add_prefix (&exec_prefixes, standard_exec_prefix, "GCC", PREFIX_PRIORITY_LAST, 1, warn_std_ptr); @@ -3860,7 +3861,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n" PREFIX_PRIORITY_LAST, 1, warn_std_ptr); add_prefix (&startfile_prefixes, standard_exec_prefix_1, "BINUTILS", PREFIX_PRIORITY_LAST, 1, warn_std_ptr); -#endif /* FREEBSD_NATIVE */ +#endif /* not FREEBSD_NATIVE */ tooldir_prefix = concat (tooldir_base_prefix, spec_machine, dir_separator_str, NULL); @@ -5978,12 +5979,12 @@ main (argc, argv) /* Read specs from a file if there is one. */ -#ifndef FREEBSD_NATIVE +#ifdef FREEBSD_NATIVE + just_machine_suffix = ""; +#else /* FREEBSD_NATIVE */ machine_suffix = concat (spec_machine, dir_separator_str, spec_version, dir_separator_str, NULL); just_machine_suffix = concat (spec_machine, dir_separator_str, NULL); -#else /* FREEBSD_NATIVE */ - just_machine_suffix = ""; #endif /* FREEBSD_NATIVE */ specs_file = find_a_file (&startfile_prefixes, "specs", R_OK); @@ -6050,11 +6051,11 @@ main (argc, argv) "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL); add_prefix (&startfile_prefixes, standard_startfile_prefix_2, "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL); +#endif /* not FREEBSD_NATIVE */ #if 0 /* Can cause surprises, and one can use -B./ instead. */ add_prefix (&startfile_prefixes, "./", NULL, PREFIX_PRIORITY_LAST, 1, NULL); #endif -#endif /* FREEBSD_NATIVE */ } else { |
