mirror of
https://gitlab.rtems.org/rtems/rtos/rtems.git
synced 2026-09-26 06:47:45 +08:00
Fixes from Ralf Corsepius:
* Posix BSP configuration: Moved some rules from make/custom/*-posix.cfg
files to make/custom/posix.cfg, Removed references to stdc++ from
*posix.cfg files (rtems doesn't use/need libstdc++)
NOTE: Building Posix-BSPs should now work again for native compilation with
gcc, i..e. linux using primary compiler and primary libc.
All Posix-BSP configurations that don't use gcc as primary compiler or
don't use the primary libc don't work, e.g. solaris, linux w/ egcs as
secondary compiler won't be built correctly.
This commit is contained in:
@@ -90,27 +90,6 @@ else
|
||||
endif
|
||||
|
||||
# Miscellaneous additions go here
|
||||
# Setting formerly contained in gcc-hpux9.cfg
|
||||
|
||||
# Not applicable - let's override 'em
|
||||
LINKCMDS=
|
||||
START_FILE=
|
||||
START_BASE=
|
||||
|
||||
# Here is the rule to actually build a $(ARCH)/foo.exe
|
||||
# It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
|
||||
# Usage ref: src/tests/sptest/sp1/Makefile
|
||||
#
|
||||
# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
|
||||
# If NODE is set as an environment variable, don't trust it, zero it out.
|
||||
# (NODE turns out to be a very common environment variable)
|
||||
ifeq (,$(NODE))
|
||||
NODE=0
|
||||
else
|
||||
ifeq "$(origin NODE)" "environment"
|
||||
NODE=0
|
||||
endif
|
||||
endif
|
||||
|
||||
# Workaround for missing ranlib support in RTEMS
|
||||
MKLIB=$(AR) s $(@) ; echo library is complete:
|
||||
|
||||
@@ -40,7 +40,6 @@ ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
|
||||
HAS_CPLUSPLUS=yes
|
||||
# No need to set it, gcc knows about them
|
||||
# LIBCC_INCLUDE=/usr/include/g++
|
||||
CPLUS_LD_LIBS=-lstdc++
|
||||
CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
|
||||
else
|
||||
HAS_CPLUSPLUS=no
|
||||
@@ -101,27 +100,5 @@ endif
|
||||
# *****************************************************************
|
||||
# Miscellaneous additions go here
|
||||
|
||||
# Setting formerly contained in gcc-linux1.cfg
|
||||
|
||||
# Not applicable - let's override 'em
|
||||
LINKCMDS=
|
||||
START_FILE=
|
||||
START_BASE=
|
||||
|
||||
# Here is the rule to actually build a $(ARCH)/foo.exe
|
||||
# It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
|
||||
# Usage ref: src/tests/sptest/sp1/Makefile
|
||||
#
|
||||
# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
|
||||
# If NODE is set as an environment variable, don't trust it, zero it out.
|
||||
# (NODE turns out to be a very common environment variable)
|
||||
ifeq (,$(NODE))
|
||||
NODE=0
|
||||
else
|
||||
ifeq "$(origin NODE)" "environment"
|
||||
NODE=0
|
||||
endif
|
||||
endif
|
||||
|
||||
# Workaround for missing ranlib support in RTEMS
|
||||
MKLIB=$(AR) s $(@) ; echo library is complete:
|
||||
|
||||
@@ -34,7 +34,6 @@ ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
|
||||
HAS_CPLUSPLUS=yes
|
||||
# no standard C++ libs provided by default
|
||||
LIBCC_INCLUDE=$(GNUTOOLS)/include/g++
|
||||
CPLUS_LD_LIBS=-lstdc++
|
||||
CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
|
||||
else
|
||||
HAS_CPLUSPLUS=no
|
||||
|
||||
@@ -9,4 +9,25 @@ include $(PROJECT_ROOT)/make/host.cfg
|
||||
|
||||
include $(RTEMS_ROOT)/make/custom/$(RTEMS_HOST)-posix.cfg
|
||||
|
||||
# Setting formerly contained in gcc-<TARGET_ARCH>.cfg
|
||||
|
||||
# Not applicable - let's override 'em
|
||||
LINKCMDS=
|
||||
START_FILE=
|
||||
START_BASE=
|
||||
|
||||
# Here is the rule to actually build a $(ARCH)/foo.exe
|
||||
# It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
|
||||
# Usage ref: src/tests/sptest/sp1/Makefile
|
||||
#
|
||||
# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
|
||||
# If NODE is set as an environment variable, don't trust it, zero it out.
|
||||
# (NODE turns out to be a very common environment variable)
|
||||
ifeq (,$(NODE))
|
||||
NODE=0
|
||||
else
|
||||
ifeq "$(origin NODE)" "environment"
|
||||
NODE=0
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user