[rtems commit] build: Fix legacy Makefile support

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    6ca00e61dc8ba9f3c0510aa88209ef8ca31e3b6d
Changeset: http://git.rtems.org/rtems/commit/?id=6ca00e61dc8ba9f3c0510aa88209ef8ca31e3b6d

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sat Oct 10 13:49:33 2020 +0200

build: Fix legacy Makefile support

Close #4140.

---

 make/compilers/gcc-target-default.cfg | 3 +--
 spec/build/bsps/makecustom.yml        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/make/compilers/gcc-target-default.cfg b/make/compilers/gcc-target-default.cfg
index 813bd5c..d440b4d 100644
--- a/make/compilers/gcc-target-default.cfg
+++ b/make/compilers/gcc-target-default.cfg
@@ -29,8 +29,7 @@ ASFLAGS  = $(CPU_ASFLAGS) $(XASFLAGS)
 GCCSPECS_OPTIMIZE_V =
 GCCSPECS_DEBUG_V =
 
-GCCSPECS = -B$(PROJECT_RELEASE)/lib/ -specs bsp_specs -qrtems 
-GCCSPECS += $(GCCSPECS_$(VARIANT_V)_V)
+GCCSPECS = $(GCCSPECS_$(VARIANT_V)_V)
 
 CC  += $(GCCSPECS)
 CXX += $(GCCSPECS)
diff --git a/spec/build/bsps/makecustom.yml b/spec/build/bsps/makecustom.yml
index e04d428..139629b 100644
--- a/spec/build/bsps/makecustom.yml
+++ b/spec/build/bsps/makecustom.yml
@@ -2,10 +2,10 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: config-file
 content: |
   include $$(RTEMS_ROOT)/make/custom/default.cfg
-  RTEMS_CPU = ${ARCH}
+  CPU_DEFINES = -I$$(exec_prefix)/$$(RTEMS_BSP)/lib/include
   CPU_CFLAGS = ${ABI_FLAGS}
   CFLAGS_OPTIMIZE_V = ${OPTIMIZATION_FLAGS}
-  LDFLAGS = ${LDFLAGS}
+  LDFLAGS = -B$$(exec_prefix)/$$(RTEMS_BSP)/lib ${PKGCONFIG_LDFLAGS}
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 enabled-by: true