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

src/Makefile.all.am

@@ -164 +164 @@
 AM_CCASFLAGS_ARM_LINUX    = $(AM_CPPFLAGS_ARM_LINUX) @FLAG_M32@ \
                                 -marm -mcpu=cortex-a8 -g
 
-AM_FLAG_M3264_X86_DARWIN = -arch i386
-AM_CFLAGS_X86_DARWIN     = $(WERROR) -arch i386 $(AM_CFLAGS_BASE) \
+AM_FLAG_M3264_X86_DARWIN = @FLAG_ARCH_I386@
+AM_CFLAGS_X86_DARWIN     = $(WERROR) @FLAG_ARCH_I386@ $(AM_CFLAGS_BASE) \
                                 -mmacosx-version-min=10.5 \
                                 -fno-stack-protector -fno-pic -fno-PIC
 
-AM_CCASFLAGS_X86_DARWIN  = $(AM_CPPFLAGS_X86_DARWIN) -arch i386 -g
+AM_CCASFLAGS_X86_DARWIN  = $(AM_CPPFLAGS_X86_DARWIN) @FLAG_ARCH_I386@ -g
 
-AM_FLAG_M3264_AMD64_DARWIN = -arch x86_64
-AM_CFLAGS_AMD64_DARWIN     = $(WERROR) -arch x86_64 $(AM_CFLAGS_BASE) \
+AM_FLAG_M3264_AMD64_DARWIN = @FLAG_ARCH_X86_64@
+AM_CFLAGS_AMD64_DARWIN     = $(WERROR) @FLAG_ARCH_X86_64@ $(AM_CFLAGS_BASE) \
                             -mmacosx-version-min=10.5 -fno-stack-protector
-AM_CCASFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_AMD64_DARWIN) -arch x86_64 -g
+AM_CCASFLAGS_AMD64_DARWIN  = $(AM_CPPFLAGS_AMD64_DARWIN) @FLAG_ARCH_X86_64@ -g
 
 AM_FLAG_M3264_S390X_LINUX = @FLAG_M64@
 AM_CFLAGS_S390X_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE)
@@ -207 +207 @@
 PRELOAD_LDFLAGS_PPC32_LINUX  = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
 PRELOAD_LDFLAGS_PPC64_LINUX  = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@
 PRELOAD_LDFLAGS_ARM_LINUX    = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M32@
-PRELOAD_LDFLAGS_X86_DARWIN   = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch i386
-PRELOAD_LDFLAGS_AMD64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) -arch x86_64
+PRELOAD_LDFLAGS_X86_DARWIN   = $(PRELOAD_LDFLAGS_COMMON_DARWIN) @FLAG_ARCH_I386@
+PRELOAD_LDFLAGS_AMD64_DARWIN = $(PRELOAD_LDFLAGS_COMMON_DARWIN) @FLAG_ARCH_X86_64@
 PRELOAD_LDFLAGS_S390X_LINUX  = $(PRELOAD_LDFLAGS_COMMON_LINUX) @FLAG_M64@