Modifications for alpha OSF1.

diff --git a/conf/GeneralMacros b/conf/GeneralMacros
index c34f14d3781790e877966bb7bd8ee31c7aa0fad9..2d679c33dfc70ed3f535f15097031d9d2f1fbadd 100644 (file)
--- a/conf/GeneralMacros
+++ b/conf/GeneralMacros
@@ -7,7 +7,7 @@ $(SLIBRARY):
                   @$(SHLD) -o $@ $(LIBS) -p 0 $^
                 else
                    ifeq ($(PLATFORM),alpha)
-                     @$(SHLD) -o $@ $^ -lcxxstd -lcxx -lexc -lots -lc
+                     @$(SHLD) $(SOFLAGS) $(LDFLAGS) $^ $(SHLIB) -o $@ 
                    else
                      @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(SHLIB) -o $@
                    endif

diff --git a/conf/MachineDef.OSF1 b/conf/MachineDef.OSF1
index 6516a3239a111b957da817a19ea151c3be94337c..a916260ec0acefa02ce882265c45a0b5ef4f20c7 100644 (file)
--- a/conf/MachineDef.OSF1
+++ b/conf/MachineDef.OSF1
@@ -30,10 +30,10 @@ DEPINC            = -I/usr/include/cxx
 
 LD            = cxx
 LDFLAGS       = $(OPT)
-SOFLAGS       = -b
-SHLD          = ld -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx -expect_unresolved \
+SOFLAGS       = -L/usr/lib/cmplrs/cxx -rpath /usr/lib/cmplrs/cxx -expect_unresolved \
        -g0 -O1 -msym -shared /usr/lib/cmplrs/cc/crt0.o /usr/lib/cmplrs/cxx/_main.o
-SHFLIB        = -lUfor -lfor -lFutil -lm
+SHLD          = ld
+SHLIB        = -lcxxstd -lcxx -lexc -lots -lc -lUfor -lfor -lFutil -lm
 
 G3LIBS        = -lgeant321
 CLIBS         = -lminicern