diff --git a/Makefile b/Makefile index a276cc273c7547ea7220373e5cdb1635d5e596d3..42f51a06c2988c6cd5813a95f5e9b7c3a21dfd32 100644 --- a/Makefile +++ b/Makefile @@ -205,6 +205,14 @@ ROOTLIBSDEP = $(CORELIB) $(CINTLIB) $(HISTLIB) \ $(GRAFLIB) $(G3DLIB) $(GPADLIB) $(TREELIB) $(MATRIXLIB) ifeq ($(FORCELINK),yes) # Force linking of not referenced libraries +ifeq ($(PLATFORM),aix5) +ROOTULIBS := -Wl,-u,.G__cpp_setupG__Hist \ + -Wl,-u,.G__cpp_setupG__Graf1 \ + -Wl,-u,.G__cpp_setupG__G3D \ + -Wl,-u,.G__cpp_setupG__GPad \ + -Wl,-u,.G__cpp_setupG__Tree \ + -Wl,-u,.G__cpp_setupG__Matrix +else ROOTULIBS := -Wl,-u,_G__cpp_setupG__Hist \ -Wl,-u,_G__cpp_setupG__Graf1 \ -Wl,-u,_G__cpp_setupG__G3D \ @@ -212,6 +220,7 @@ ROOTULIBS := -Wl,-u,_G__cpp_setupG__Hist \ -Wl,-u,_G__cpp_setupG__Tree \ -Wl,-u,_G__cpp_setupG__Matrix endif +endif ifeq ($(PLATFORM),win32) # Force linking of not referenced libraries ROOTULIBS := -include:_G__cpp_setupG__Hist \ diff --git a/config/Makefile.aix5 b/config/Makefile.aix5 index 96a25529fb5a44d0ebe0adaaa764e1349b68e508..b2ab5d88700f11bf88ebff19dbe659b1167b6283 100644 --- a/config/Makefile.aix5 +++ b/config/Makefile.aix5 @@ -36,6 +36,7 @@ LD = xlC LDFLAGS = $(OPT) $(EXTRA_LDFLAGS) SOFLAGS = SOEXT = a +FORCELINK = yes # System libraries: SYSLIBS = -lm -lld $(OSTHREADLIBDIR) $(OSTHREADLIB) diff --git a/config/Makefile.aixgcc b/config/Makefile.aixgcc index 5e806ac311a14be2938be5680c8a08d2cedb6f53..54093d022e0d1f1e34517eb932e624ee3a94f4c4 100644 --- a/config/Makefile.aixgcc +++ b/config/Makefile.aixgcc @@ -32,6 +32,7 @@ LD = g++ LDFLAGS = -Wl,-bbigtoc $(EXTRA_LDFLAGS) SOFLAGS = -shared SOEXT = a +FORCELINK = yes # System libraries: SYSLIBS = -lm -lld $(OSTHREADLIBDIR) $(OSTHREADLIB) diff --git a/config/root-config.in b/config/root-config.in index 5735b55340d030b47796e15fb5cb967a00dc4d0f..95d64fcdcf742dcd746e51c01c8e98caa8fb9e7c 100755 --- a/config/root-config.in +++ b/config/root-config.in @@ -24,16 +24,6 @@ newlib="-lNew" rootlibs="-lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint \ -lPostscript -lMatrix -lPhysics" rootglibs="-lGui" -rootulibs="-Wl,-u,_G__cpp_setupG__Hist \ - -Wl,-u,_G__cpp_setupG__Graf1 \ - -Wl,-u,_G__cpp_setupG__G3D \ - -Wl,-u,_G__cpp_setupG__GPad \ - -Wl,-u,_G__cpp_setupG__Tree \ - -Wl,-u,_G__cpp_setupG__Rint \ - -Wl,-u,_G__cpp_setupG__PostScript \ - -Wl,-u,_G__cpp_setupG__Matrix \ - -Wl,-u,_G__cpp_setupG__Physics" -rootuglibs="-Wl,-u,_G__cpp_setupG__Gui1" if test "$platform" = "win32"; then rootulibs="-include:_G__cpp_setupG__Hist \ -include:_G__cpp_setupG__Graf1 \ @@ -45,6 +35,28 @@ if test "$platform" = "win32"; then -include:_G__cpp_setupG__Matrix \ -include:_G__cpp_setupG__Physics" rootuglibs="-include:_G__cpp_setupG__Gui1" +elif test "$platform" = "aix5"; then + rootulibs="-Wl,-u,.G__cpp_setupG__Hist \ + -Wl,-u,.G__cpp_setupG__Graf1 \ + -Wl,-u,.G__cpp_setupG__G3D \ + -Wl,-u,.G__cpp_setupG__GPad \ + -Wl,-u,.G__cpp_setupG__Tree \ + -Wl,-u,.G__cpp_setupG__Rint \ + -Wl,-u,.G__cpp_setupG__PostScript \ + -Wl,-u,.G__cpp_setupG__Matrix \ + -Wl,-u,.G__cpp_setupG__Physics" + rootuglibs="-Wl,-u,.G__cpp_setupG__Gui1" +else + rootulibs="-Wl,-u,_G__cpp_setupG__Hist \ + -Wl,-u,_G__cpp_setupG__Graf1 \ + -Wl,-u,_G__cpp_setupG__G3D \ + -Wl,-u,_G__cpp_setupG__GPad \ + -Wl,-u,_G__cpp_setupG__Tree \ + -Wl,-u,_G__cpp_setupG__Rint \ + -Wl,-u,_G__cpp_setupG__PostScript \ + -Wl,-u,_G__cpp_setupG__Matrix \ + -Wl,-u,_G__cpp_setupG__Physics" + rootuglibs="-Wl,-u,_G__cpp_setupG__Gui1" fi ### machine dependent settings ### @@ -74,11 +86,15 @@ aix | aix5) # IBM AIX auxcflags="-qnoro -qnoroconst -qmaxmem=-1" auxlibs= + forcelibs=$rootulibs + forceglibs=$rootuglibs ;; aixgcc) # IBM AIX with g++ auxcflags="-fsigned-char" auxlibs= + forcelibs=$rootulibs + forceglibs=$rootuglibs ;; solaris) # Solaris