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
This commit is contained in:
parent
7ac56ff043
commit
8a0ef21949
|
@ -140,15 +140,15 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ARCH),x86_64)
|
ifeq ($(ARCH),x86_64)
|
||||||
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
|
ifneq ($(CONFIG_SOLARIS),yes)
|
||||||
|
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(ARCH),ppc)
|
ifeq ($(ARCH),ppc)
|
||||||
CPPFLAGS+= -D__powerpc__
|
CPPFLAGS+= -D__powerpc__
|
||||||
ifdef CONFIG_LINUX_USER
|
|
||||||
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
|
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
|
||||||
endif
|
endif
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(ARCH),s390)
|
ifeq ($(ARCH),s390)
|
||||||
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
|
BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
|
||||||
|
@ -554,6 +554,13 @@ ifeq ($(ARCH),sparc64)
|
||||||
endif
|
endif
|
||||||
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
|
ifdef CONFIG_WIN32
|
||||||
SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
|
SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue