diff --git a/include/my_global.h b/include/my_global.h index 6f33e570ba3..c9b9a4c2eae 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -103,7 +103,7 @@ #ifdef _AIX /* By soren@t.dk */ #define _H_STRINGS #define _SYS_STREAM_H -#define _AIX32_CURSES +/* #define _AIX32_CURSES */ /* XXX: this breaks AIX 4.3.3 (others?). */ #endif #ifdef HAVE_BROKEN_SNPRINTF /* HPUX 10.20 don't have this defined */ diff --git a/ltconfig b/ltconfig index 18af7c4dce8..b9df847729d 100755 --- a/ltconfig +++ b/ltconfig @@ -1308,7 +1308,9 @@ else hardcode_direct=yes fi allow_undefined_flag=' ${wl}-berok' - archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}' + # -qmkshrobj used to be -bexpall, but MySQL uses symbols which start with + # an underscore (e.g., _my_b_write), so -bexpall doesn't work. + archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-qmkshrobj ${wl}-bnoentry${allow_undefined_flag}' archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}' case "$host_os" in aix4.[01]|aix4.[01].*) # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on