From ff076545603e26b933e4edb3be2e7bc909a04aa2 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 13 Aug 2019 14:38:39 +0200 Subject: [PATCH] noux: rm explicit dependency from libc_noux.lib.so Issue #3472 --- repos/ports/mk/noux.mk | 2 -- repos/ports/src/noux-pkg/gcc/target.inc | 2 +- repos/ports/src/test/libc_noux/target.mk | 2 +- repos/ports/src/test/noux_fork/target.mk | 2 +- repos/ports/src/test/noux_signals/target.mk | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/repos/ports/mk/noux.mk b/repos/ports/mk/noux.mk index 0a2ef9151..a17b55b24 100644 --- a/repos/ports/mk/noux.mk +++ b/repos/ports/mk/noux.mk @@ -1,7 +1,5 @@ GNU_BUILD_MK := $(call select_from_repositories,mk/gnu_build.mk) -LIBS += libc_noux - PKG_DIR ?= $(call select_from_ports,$(PKG))/src/noux-pkg/$(PKG) include $(GNU_BUILD_MK) diff --git a/repos/ports/src/noux-pkg/gcc/target.inc b/repos/ports/src/noux-pkg/gcc/target.inc index defa8f7ad..0d3726e18 100644 --- a/repos/ports/src/noux-pkg/gcc/target.inc +++ b/repos/ports/src/noux-pkg/gcc/target.inc @@ -57,7 +57,7 @@ libgmp.a libmpfr.a libmpc.a libc.a: Makefile: dummy_libs -LIBS += libc libm posix libc_noux stdcxx base +LIBS += libc libm posix stdcxx base include $(call select_from_repositories,mk/noux.mk) diff --git a/repos/ports/src/test/libc_noux/target.mk b/repos/ports/src/test/libc_noux/target.mk index 916a36d0e..24ff82bd7 100644 --- a/repos/ports/src/test/libc_noux/target.mk +++ b/repos/ports/src/test/libc_noux/target.mk @@ -1,5 +1,5 @@ TARGET = test-libc_noux -LIBS = libc libc_noux +LIBS = libc SRC_CC = main.cc # we re-use the libc_vfs test diff --git a/repos/ports/src/test/noux_fork/target.mk b/repos/ports/src/test/noux_fork/target.mk index 073508fa6..9d94b9841 100644 --- a/repos/ports/src/test/noux_fork/target.mk +++ b/repos/ports/src/test/noux_fork/target.mk @@ -1,5 +1,5 @@ TARGET = test-noux_fork SRC_CC = test.cc -LIBS = posix libc_noux +LIBS = posix CC_CXX_WARN_STRICT = diff --git a/repos/ports/src/test/noux_signals/target.mk b/repos/ports/src/test/noux_signals/target.mk index b5781e7a9..c17f57aa8 100644 --- a/repos/ports/src/test/noux_signals/target.mk +++ b/repos/ports/src/test/noux_signals/target.mk @@ -1,5 +1,5 @@ TARGET = test-noux_signals SRC_CC = main.cc -LIBS = posix libc_noux +LIBS = posix CC_CXX_WARN_STRICT =