Commit 8a0ef21949d0606d1510da256ed7d4e9128c5d6d

Authored by ths
1 parent 7ac56ff0

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
Showing 1 changed file with 10 additions and 3 deletions
Makefile.target
@@ -140,15 +140,15 @@ endif @@ -140,15 +140,15 @@ endif
140 endif 140 endif
141 141
142 ifeq ($(ARCH),x86_64) 142 ifeq ($(ARCH),x86_64)
143 -BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld 143 + ifneq ($(CONFIG_SOLARIS),yes)
  144 + BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
  145 + endif
144 endif 146 endif
145 147
146 ifeq ($(ARCH),ppc) 148 ifeq ($(ARCH),ppc)
147 CPPFLAGS+= -D__powerpc__ 149 CPPFLAGS+= -D__powerpc__
148 -ifdef CONFIG_LINUX_USER  
149 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld 150 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
150 endif 151 endif
151 -endif  
152 152
153 ifeq ($(ARCH),s390) 153 ifeq ($(ARCH),s390)
154 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld 154 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
@@ -554,6 +554,13 @@ ifeq ($(ARCH),sparc64) @@ -554,6 +554,13 @@ ifeq ($(ARCH),sparc64)
554 endif 554 endif
555 endif 555 endif
556 556
  557 +ifeq ($(ARCH),x86_64)
  558 + VL_LDFLAGS+=-m64
  559 + ifneq ($(CONFIG_SOLARIS),yes)
  560 + VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
  561 + endif
  562 +endif
  563 +
557 ifdef CONFIG_WIN32 564 ifdef CONFIG_WIN32
558 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole 565 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
559 endif 566 endif