summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog-99b5
-rw-r--r--include/makeinclude/platform_linux_cxx.GNU4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 3d79d876a22..003be1a36da 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,8 @@
+Wed Dec 29 13:21:48 1999 David L. Levine <levine@cs.wustl.edu>
+
+ * include/makeinclude/platform_linux_cxx.GNU: added
+ MATHLIB and test -f cxx_repository/*.o.
+
Wed Dec 29 09:11:46 1999 David L. Levine <levine@cs.wustl.edu>
* ace/config-cxx-common.h: enable ACE_USES_OLD_IOSTREAMS
diff --git a/include/makeinclude/platform_linux_cxx.GNU b/include/makeinclude/platform_linux_cxx.GNU
index 86c790f6fca..518f9fdf4d2 100644
--- a/include/makeinclude/platform_linux_cxx.GNU
+++ b/include/makeinclude/platform_linux_cxx.GNU
@@ -28,13 +28,15 @@ LIBS += -ldl -lpthread
ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT))
LIBS += -lrt
endif
+MATHLIB = -lm
OCFLAGS += -O4
PIC =
ARFLAGS = rsuv
# When libraries are archived, a hash index is automatically created
# so there is no need for ranlib
RANLIB = @true
-SOFLAGS = -shared $(ACELIB) cxx_repository/*.o
+SOFLAGS = -shared $(ACELIB) \
+ `test -f "cxx_repository/*.o" && echo 'cxx_repository/*.o'`
SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
ln $(VSHDIR)$*.o $@