diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-21 10:27:13 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-21 10:27:13 +0530 |
| commit | 318c7a5846bbfaab567c92b37941000dfc0c00c0 (patch) | |
| tree | 07ad6ed22c5646165176489050c00a8c64bdb0e8 | |
| parent | eb72478a286e0104f5636d21d86407b4c0e89fa1 (diff) | |
| download | glibc-318c7a5846bbfaab567c92b37941000dfc0c00c0.tar.gz glibc-318c7a5846bbfaab567c92b37941000dfc0c00c0.tar.xz glibc-318c7a5846bbfaab567c92b37941000dfc0c00c0.zip | |
Remove redundant CPPFLAGS for some programs
These programs get the NOT_IN_libc twice, once through the 'other' target and another explicitly. Remove the explicitly added CPFLAG. * catgets/Makefile (CPPFLAGS-gencat): Remove. * iconv/Makefile (CPPFLAGS-iconv_prog): Likewise. (CPPFLAGS-iconvconfig): Likewise. * timezone/Makefile (CPPFLAGS-zic): Likewise.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | catgets/Makefile | 2 | ||||
| -rw-r--r-- | iconv/Makefile | 2 | ||||
| -rw-r--r-- | timezone/Makefile | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 75cfd5c541..533517a606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2014-08-21 Siddhesh Poyarekar <siddhesh@redhat.com> + * catgets/Makefile (CPPFLAGS-gencat): Remove. + * iconv/Makefile (CPPFLAGS-iconv_prog): Likewise. + (CPPFLAGS-iconvconfig): Likewise. + * timezone/Makefile (CPPFLAGS-zic): Likewise. + * include/libc-symbols.h: Remove unnecessary check for NOT_IN_libc. * nptl/pthreadP.h: Likewise. diff --git a/catgets/Makefile b/catgets/Makefile index 4a03eba377..008d7dbf7a 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -48,8 +48,6 @@ $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o) catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' -CPPFLAGS-gencat = -DNOT_IN_libc - generated += de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \ test-gencat.h generated-dirs += de diff --git a/iconv/Makefile b/iconv/Makefile index 5de04a0b76..48d17d7a55 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -52,9 +52,7 @@ CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' -CPPFLAGS-iconv_prog = -DNOT_IN_libc CPPFLAGS-iconv_charmap = -DNOT_IN_libc -CPPFLAGS-iconvconfig = -DNOT_IN_libc CPPFLAGS-linereader = -DNOT_IN_libc CPPFLAGS-strtab = -DNOT_IN_libc CPPFLAGS-charmap = -DNOT_IN_libc diff --git a/timezone/Makefile b/timezone/Makefile index 6e008bc956..66b59ceeda 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -40,8 +40,6 @@ install-sbin := zic zdump generated-dirs += testdata -CPPFLAGS-zic = -DNOT_IN_libc - install-bin-script = tzselect generated += tzselect |