diff -ur ooo_SRC680_m162_src.orig/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk ooo_SRC680_m162_src/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk --- ooo_SRC680_m162_src.orig/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk 2006-04-01 15:24:51.000000000 +0200 +++ ooo_SRC680_m162_src/bridges/source/cpp_uno/gcc3_macosx_intel/makefile.mk 2006-04-01 15:26:30.000000000 +0200 @@ -47,9 +47,13 @@ .INCLUDE : settings.mk .INCLUDE : sv.mk +# PJ: temporary disable universal binaries build for bridges +UNIVERSAL_CFLAGS= +UNIVERSAL_LDFLAGS= + # --- Files -------------------------------------------------------- -.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXIgcc3" +.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXIgcc3" || "$(NATIVE_CPU)" == "I" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff -ur ooo_SRC680_m162_src.orig/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk ooo_SRC680_m162_src/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk --- ooo_SRC680_m162_src.orig/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk 2006-04-01 15:25:16.000000000 +0200 +++ ooo_SRC680_m162_src/bridges/source/cpp_uno/gcc3_macosx_powerpc/makefile.mk 2006-04-01 15:26:57.000000000 +0200 @@ -47,9 +47,13 @@ .INCLUDE : settings.mk .INCLUDE : sv.mk +# PJ: temporary disable universal binaries build for bridges +UNIVERSAL_CFLAGS= +UNIVERSAL_LDFLAGS= + # --- Files -------------------------------------------------------- -.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXPgcc3" +.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCMACOSXPgcc3" || "$(NATIVE_CPU)" == "P" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA