diff options
| author | Steve Huston <shuston@riverace.com> | 2002-10-19 02:15:45 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2002-10-19 02:15:45 +0000 |
| commit | 4eee0de7eaf837beaada1933be7f092bdb0793f7 (patch) | |
| tree | 08504380322e2022bfe4624e311484db94ef4abe /include/makeinclude | |
| parent | 3865a3f94524a94514cf47fd549f3b50c00d2cda (diff) | |
| download | ATCD-4eee0de7eaf837beaada1933be7f092bdb0793f7.tar.gz | |
ChangeLogTag:Fri Oct 18 22:07:31 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'include/makeinclude')
| -rw-r--r-- | include/makeinclude/platform_aix4_g++.GNU | 8 | ||||
| -rw-r--r-- | include/makeinclude/platform_g++_common.GNU | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/makeinclude/platform_aix4_g++.GNU b/include/makeinclude/platform_aix4_g++.GNU index efd557a35b2..c047d47044c 100644 --- a/include/makeinclude/platform_aix4_g++.GNU +++ b/include/makeinclude/platform_aix4_g++.GNU @@ -1,7 +1,7 @@ # $Id$ # # Platform macros for building on AIX 4.x with g++. This has been tested on -# AIX 4.3 with gcc 3.1 +# AIX 4.3 with gcc 3.2 # # Original contributed by Ian Wright <I.Wright@elsevier.co.uk>. Updated for # AIX 4 and egcs by Steve Huston <shuston@riverace.com>. @@ -22,6 +22,9 @@ endif ifeq (,$(exceptions)) exceptions = 0 endif +ifeq (,$(with_ld)) + with_ld = aix +endif # Yes, believe it or not... # The way to make a shared lib on AIX is to make a shared object file and @@ -79,8 +82,7 @@ SOFLAGS += -shared -Wl,-bexpall # -Wl,-bloadmap:lib.map LIBS += -ltli_r -ldl ARFLAGS = cruv RANLIB = ranlib -SONAME = -SOVERSION = + # On AIX, shared libraries are not generally left in .so form to link against. # To do so requires the run-time linker and that is an unnecessary evil. # So build the .so as usual, but then put in an archive library to link diff --git a/include/makeinclude/platform_g++_common.GNU b/include/makeinclude/platform_g++_common.GNU index bcce0bd0419..13db5c1e966 100644 --- a/include/makeinclude/platform_g++_common.GNU +++ b/include/makeinclude/platform_g++_common.GNU @@ -43,6 +43,8 @@ ifneq ($(SONAME),) ifeq ($(with_ld),hpux) SOFLAGS += -Wl,+h -Wl,$(SONAME) else - SOFLAGS += -Wl,-h -Wl,$(SONAME) + ifneq ($(with_ld),aix) + SOFLAGS += -Wl,-h -Wl,$(SONAME) + endif endif endif |