summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/unix/posix
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-08-01 00:49:03 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-08-01 00:49:03 +0000
commiteec7c441d7cd393c69824c9df2fa40ec2278c0df (patch)
tree72ab5ca3def515144b83da3120bd13a8a2974f64 /c/src/lib/libbsp/unix/posix
parent2007-07-31 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadrtems-eec7c441d7cd393c69824c9df2fa40ec2278c0df.tar.bz2
2007-07-31 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, preinstall.am: You need main() to link all applications. There is no C++ specific way to link currently.
Diffstat (limited to 'c/src/lib/libbsp/unix/posix')
-rw-r--r--c/src/lib/libbsp/unix/posix/ChangeLog5
-rw-r--r--c/src/lib/libbsp/unix/posix/Makefile.am5
-rw-r--r--c/src/lib/libbsp/unix/posix/preinstall.am18
3 files changed, 17 insertions, 11 deletions
diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog
index 83c1b03aa3..2fc76b6fa1 100644
--- a/c/src/lib/libbsp/unix/posix/ChangeLog
+++ b/c/src/lib/libbsp/unix/posix/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-31 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * Makefile.am, preinstall.am: You need main() to link all applications.
+ There is no C++ specific way to link currently.
+
2007-07-24 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, startup/main.c: Now can link with C compiler and not
diff --git a/c/src/lib/libbsp/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am
index cbb74644de..436a1f4565 100644
--- a/c/src/lib/libbsp/unix/posix/Makefile.am
+++ b/c/src/lib/libbsp/unix/posix/Makefile.am
@@ -42,9 +42,10 @@ noinst_LIBRARIES =
noinst_PROGRAMS += startup.rel
startup_rel_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \
startup/bspstart.c startup/setvec.c ../../shared/bootcard.c
-if !HAS_CXX
+## for now always using main.c style startup
+##if !HAS_CXX
startup_rel_SOURCES += startup/main.c
-endif
+##endif
startup_rel_CPPFLAGS = $(AM_CPPFLAGS)
startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
diff --git a/c/src/lib/libbsp/unix/posix/preinstall.am b/c/src/lib/libbsp/unix/posix/preinstall.am
index 3ea7f958b9..258d1e5c84 100644
--- a/c/src/lib/libbsp/unix/posix/preinstall.am
+++ b/c/src/lib/libbsp/unix/posix/preinstall.am
@@ -48,12 +48,12 @@ $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
-if HAS_CXX
-$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
-
-$(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
-TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
-endif
+##if HAS_CXX
+##$(PROJECT_LIB)/no-ctor.$(OBJEXT): no-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+## $(INSTALL_DATA) $< $(PROJECT_LIB)/no-ctor.$(OBJEXT)
+##TMPINSTALL_FILES += $(PROJECT_LIB)/no-ctor.$(OBJEXT)
+##
+##$(PROJECT_LIB)/rtems-ctor.$(OBJEXT): rtems-ctor.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+## $(INSTALL_DATA) $< $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
+##TMPINSTALL_FILES += $(PROJECT_LIB)/rtems-ctor.$(OBJEXT)
+##endif