Commit 8a0ef219 authored by Thiemo Seufer's avatar Thiemo Seufer
Browse files

Solaris build fixes, based on a patch by Ben Taylor. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3697 c046a42c-6fe2-441c-8c8c-71466251a162
parent 7ac56ff0

Makefile.target

+10 −3
Original line number Diff line number Diff line
@@ -140,15 +140,15 @@ endif 
endif



ifeq ($(ARCH),x86_64)

  ifneq ($(CONFIG_SOLARIS),yes)

    BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld

  endif

endif



ifeq ($(ARCH),ppc)

CPPFLAGS+= -D__powerpc__

ifdef CONFIG_LINUX_USER

BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld

endif

endif



ifeq ($(ARCH),s390)

BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
@@ -554,6 +554,13 @@ ifeq ($(ARCH),sparc64) 
  endif

endif



ifeq ($(ARCH),x86_64)

  VL_LDFLAGS+=-m64

  ifneq ($(CONFIG_SOLARIS),yes)

    VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld

  endif

endif



ifdef CONFIG_WIN32

SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole

endif