Ticket #13060: arch_flag-Makefile.all.am.diff

File arch_flag-Makefile.all.am.diff, 1.9 KB (added by jpflori, 9 years ago)

Diff for Makefile.all.am; test for -arch flag.

  • src/Makefile.all.am

    old new  
    164164AM_CCASFLAGS_ARM_LINUX    = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
    165165                                -marm -mcpu=cortex-a8 -g
    166166
    167 AM_FLAG_M3264_X86_DARWIN = -arch i386
    168 AM_CFLAGS_X86_DARWIN     = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
     167AM_FLAG_M3264_X86_DARWIN = @FLAG_ARCH_I386@
     168AM_CFLAGS_X86_DARWIN     = $(WERROR) @FLAG_ARCH_I386@ $(AM_CFLAGS_BASE) \
    169169                                -mmacosx-version-min=10.5 \
    170170                                -fno-stack-protector -fno-pic -fno-PIC
    171171
    172 AM_CCASFLAGS_X86_DARWIN  = $(AM_CPPFLAGS_X86_DARWIN) -arch i386 -g
     172AM_CCASFLAGS_X86_DARWIN  = $(AM_CPPFLAGS_X86_DARWIN) @FLAG_ARCH_I386@ -g
    173173
    174 AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64
    175 AM_CFLAGS_AMD64_DARWIN     = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \
     174AM_FLAG_M3264_AMD64_DARWIN = @FLAG_ARCH_X86_64@
     175AM_CFLAGS_AMD64_DARWIN     = $(WERROR) @FLAG_ARCH_X86_64@ $(AM_CFLAGS_BASE) \
    176176                            -mmacosx-version-min=10.5 -fno-stack-protector
    177 AM_CCASFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_AMD64_DARWIN) -arch x86_64 -g
     177AM_CCASFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_AMD64_DARWIN) @FLAG_ARCH_X86_64@ -g
    178178
    179179AM_FLAG_M3264_S390X_LINUX = @FLAG_M64@
    180180AM_CFLAGS_S390X_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
     
    207207PRELOAD_LDFLAGS_PPC32_LINUX  = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
    208208PRELOAD_LDFLAGS_PPC64_LINUX  = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
    209209PRELOAD_LDFLAGS_ARM_LINUX    = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
    210 PRELOAD_LDFLAGS_X86_DARWIN   = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch i386
    211 PRELOAD_LDFLAGS_AMD64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch x86_64
     210PRELOAD_LDFLAGS_X86_DARWIN   = $(PRELOAD_LDFLAGS_COMMON_DARWIN) @FLAG_ARCH_I386@
     211PRELOAD_LDFLAGS_AMD64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) @FLAG_ARCH_X86_64@
    212212PRELOAD_LDFLAGS_S390X_LINUX  = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
    213213