From f97d9175261e2cbcdeb17a6c8955502871c99115 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Mon, 6 May 2019 21:37:31 +0200 Subject: [PATCH] Move getopt from linux directory to glibc one --- options/{linux => glibc}/generic/getopt-stubs.cpp | 0 options/{linux => glibc}/include/getopt.h | 0 options/glibc/meson.build | 2 ++ options/linux/meson.build | 2 -- 4 files changed, 2 insertions(+), 2 deletions(-) rename options/{linux => glibc}/generic/getopt-stubs.cpp (100%) rename options/{linux => glibc}/include/getopt.h (100%) diff --git a/options/linux/generic/getopt-stubs.cpp b/options/glibc/generic/getopt-stubs.cpp similarity index 100% rename from options/linux/generic/getopt-stubs.cpp rename to options/glibc/generic/getopt-stubs.cpp diff --git a/options/linux/include/getopt.h b/options/glibc/include/getopt.h similarity index 100% rename from options/linux/include/getopt.h rename to options/glibc/include/getopt.h diff --git a/options/glibc/meson.build b/options/glibc/meson.build index 92a6e8ad..12b03c75 100644 --- a/options/glibc/meson.build +++ b/options/glibc/meson.build @@ -1,10 +1,12 @@ libc_sources += files( + 'generic/getopt-stubs.cpp', 'generic/stdio_ext-stubs.cpp', 'generic/sys-ioctl.cpp', ) install_headers( + 'include/getopt.h', 'include/stdio_ext.h', ) install_headers( diff --git a/options/linux/meson.build b/options/linux/meson.build index c552834b..af4f58fd 100644 --- a/options/linux/meson.build +++ b/options/linux/meson.build @@ -3,7 +3,6 @@ if disable_linux_option subdir_done() endif libc_sources += files( - 'generic/getopt-stubs.cpp', 'generic/mntent-stubs.cpp', 'generic/poll-stubs.cpp', 'generic/pty-stubs.cpp', @@ -20,7 +19,6 @@ libc_sources += files( install_headers( 'include/elf.h', - 'include/getopt.h', 'include/malloc.h', 'include/memory.h', 'include/mntent.h',