diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:49:30 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:49:30 +0000 |
commit | e14d51045326808a48d43d7e0b45860cd33e2b17 (patch) | |
tree | 90b47e500bf7b1ccffae92fc2105cea5b8b7b61f /grp/Makefile | |
parent | c949e9c224c0fc890982cc42797ae868b04faa00 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/context_functions' into t/context_functions
Diffstat (limited to 'grp/Makefile')
-rw-r--r-- | grp/Makefile | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/grp/Makefile b/grp/Makefile index 4f1809cea5..d72fee5f6b 100644 --- a/grp/Makefile +++ b/grp/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2016 Free Software Foundation, Inc. +# Copyright (C) 1991-2018 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -26,7 +26,8 @@ headers := grp.h routines := fgetgrent initgroups setgroups \ getgrent getgrgid getgrnam putgrent \ - getgrent_r getgrgid_r getgrnam_r fgetgrent_r + getgrent_r getgrgid_r getgrnam_r fgetgrent_r \ + grp-merge tests := testgrp tst-putgrent @@ -42,15 +43,15 @@ include ../Rules ifeq ($(have-thread-library),yes) -CFLAGS-getgrgid_r.c = -fexceptions -CFLAGS-getgrnam_r.c = -fexceptions -CFLAGS-getgrent_r.c = -fexceptions -CFLAGS-getgrent.c = -fexceptions -CFLAGS-fgetgrent.c = -fexceptions -CFLAGS-fgetgrent_r.c = -fexceptions $(libio-mtsafe) -CFLAGS-putgrent.c = -fexceptions $(libio-mtsafe) -CFLAGS-initgroups.c = -fexceptions -CFLAGS-getgrgid.c = -fexceptions +CFLAGS-getgrgid_r.c += -fexceptions +CFLAGS-getgrnam_r.c += -fexceptions +CFLAGS-getgrent_r.c += -fexceptions +CFLAGS-getgrent.c += -fexceptions +CFLAGS-fgetgrent.c += -fexceptions +CFLAGS-fgetgrent_r.c += -fexceptions $(libio-mtsafe) +CFLAGS-putgrent.c += -fexceptions $(libio-mtsafe) +CFLAGS-initgroups.c += -fexceptions +CFLAGS-getgrgid.c += -fexceptions endif @@ -58,7 +59,7 @@ ifeq ($(run-built-tests),yes) # tst_fgetgrent currently only works with shared libraries ifeq (yes,$(build-shared)) $(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent - $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \ + $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' > $@; \ $(evaluate-test) endif |