Guest

VinDuv

By: a guest on Sep 9th, 2009  |  syntax: None  |  size: 0.99 KB  |  hits: 652  |  expires: Never
download  |  raw  |  embed  |  report abuse
Copied
  1. Index: build/jam/BuildSetup
  2. ===================================================================
  3. --- build/jam/BuildSetup        (revision 32930)
  4. +++ build/jam/BuildSetup        (working copy)
  5.  -474,6 +474,9 @@
  6.  # enable GCC -m32 option, if requested
  7.  if $(HAIKU_HOST_USE_32BIT) = 1 {
  8.         HOST_GCC_BASE_FLAGS = -m32 ;
  9. +       if $(HOST_PLATFORM) != darwin {
  10. +               HOST_LD_BASE_FLAGS = -m32 ;
  11. +       }
  12.  }
  13.  
  14.  
  15.  -488,7 +491,7 @@
  16.  HOST_CPPFLAGS          ?= $(CPPFLAGS) ;
  17.  HOST_CCFLAGS           ?= $(HOST_GCC_BASE_FLAGS) $(CCFLAGS) ;
  18.  HOST_C++FLAGS          ?= $(HOST_GCC_BASE_FLAGS) $(C++FLAGS) ;
  19. -HOST_LDFLAGS           ?= $(HOST_GCC_BASE_FLAGS) $(LDFLAGS) ;
  20. +HOST_LDFLAGS           ?= $(HOST_LD_BASE_FLAGS) $(LDFLAGS) ;
  21.  HOST_LINKFLAGS         ?= $(HOST_GCC_BASE_FLAGS) $(LINKFLAGS) ;
  22.  HOST_DEFINES           ?= $(DEFINES) ;
  23.  HOST_HDRS                      ?= $(HDRS) ;
  24.  -614,7 +617,7 @@
  25.  }
  26.  
  27.  # ld flags
  28. -if $(HOST_ARCH) = x86 && $(HAIKU_HOST_USE_32BIT) = 1 {
  29. +if $(HOST_ARCH) = x86 && $(HAIKU_HOST_USE_32BIT) = 1 && $(HOST_PLATFORM) != darwin {
  30.         HOST_LDFLAGS += -melf_i386 ;
  31.  }