diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-18 22:34:46 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-18 22:34:46 +0000 |
| commit | 8a0ef21949d0606d1510da256ed7d4e9128c5d6d (patch) | |
| tree | f4c41223ecfd293e418b820227b34023126372c3 | |
| parent | 7ac56ff043e82e540a5aa108bba2b44b407dd60b (diff) | |
| download | qemu-8a0ef21949d0606d1510da256ed7d4e9128c5d6d.zip qemu-8a0ef21949d0606d1510da256ed7d4e9128c5d6d.tar.gz qemu-8a0ef21949d0606d1510da256ed7d4e9128c5d6d.tar.bz2 | |
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
| -rw-r--r-- | Makefile.target | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index e4cad87..cc29d52 100644 --- a/Makefile.target +++ b/Makefile.target @@ -140,15 +140,15 @@ endif endif 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 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 |