[omniORB] [patch] CXXOPTIONS make variable wasn't used for some shlibs

Steven Mueller diffusor@ugcs.caltech.edu
Tue, 18 Dec 2001 18:15:33 -0800


I recently succeeded in cross compiling omniorb 3.04 for an embedded
IBM ppc 405.  My build environment is a pIII running Debian linux
(testing distribution) with a gcc3.0 built from MontaVista's HardHat
2.0.  Since the 405 doesn't support floating point, I added -mcpu=403
to the CXXOPTIONS makefile variable in the mk/platform file.  (gcc
doesn't differentiate between the 403 and the 405.)  Two of the shared
libraries, however, don't respect CXXOPTIONS in their dir.mk files.
This patch fixes that (but only for the linux build environment where
I have tested it).

Cheers,
Steve

--- omni.orig/src/lib/omniORB2/orbcore/sharedlib/dir.mk	Mon Jun 18 10:43:00 2001
+++ omni/src/lib/omniORB2/orbcore/sharedlib/dir.mk	Tue Dec 18 16:24:00 2001
@@ -253,7 +253,7 @@
 $(lib): $(ORB_OBJS)
 	(set -x; \
         $(RM) $@; \
-        $(CXX) -shared -Wl,-soname,$(soname) -o $@ $(IMPORT_LIBRARY_FLAGS) \
+        $(CXX) $(CXXOPTIONS) -shared -Wl,-soname,$(soname) -o $@ $(IMPORT_LIBRARY_FLAGS) \
          $(filter-out $(LibSuffixPattern),$^) $(OMNITHREAD_LIB); \
        )
 
--- omni.orig/src/lib/omniORB2/dynamic/sharedlib/dir.mk	Mon Jun 18 10:43:01 2001
+++ omni/src/lib/omniORB2/dynamic/sharedlib/dir.mk	Tue Dec 18 16:03:29 2001
@@ -257,7 +257,7 @@
 $(dynlib): $(DYN_OBJS)
 	(set -x; \
         $(RM) $@; \
-        $(CXX) -shared -Wl,-soname,$(dynsoname) -o $@ $(IMPORT_LIBRARY_FLAGS) \
+        $(CXX) $(CXXOPTIONS) -shared -Wl,-soname,$(dynsoname) -o $@ $(IMPORT_LIBRARY_FLAGS) \
          $(filter-out $(LibSuffixPattern),$^) $(OMNITHREAD_LIB) \
          ../../orbcore/sharedlib/$(lib); \
        )

-- 
Steven Mueller
diffusor@ugcs.caltech.edu