Commit 240f24e01372201d44115e945edb39d91a6cc1be
1 parent
0feef828
Fix Makefile weirdness.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2285 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
2 additions
and
7 deletions
Makefile
| @@ -5,14 +5,14 @@ include config-host.mak | @@ -5,14 +5,14 @@ include config-host.mak | ||
| 5 | .PHONY: all clean distclean dvi info install install-doc tar tarbin \ | 5 | .PHONY: all clean distclean dvi info install install-doc tar tarbin \ |
| 6 | speed test test2 html dvi info | 6 | speed test test2 html dvi info |
| 7 | 7 | ||
| 8 | -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -I. | 8 | +CFLAGS+=-Wall -O2 -g -fno-strict-aliasing -I. |
| 9 | ifdef CONFIG_DARWIN | 9 | ifdef CONFIG_DARWIN |
| 10 | CFLAGS+= -mdynamic-no-pic | 10 | CFLAGS+= -mdynamic-no-pic |
| 11 | endif | 11 | endif |
| 12 | ifeq ($(ARCH),sparc) | 12 | ifeq ($(ARCH),sparc) |
| 13 | CFLAGS+=-mcpu=ultrasparc | 13 | CFLAGS+=-mcpu=ultrasparc |
| 14 | endif | 14 | endif |
| 15 | -LDFLAGS=-g | 15 | +LDFLAGS+=-g |
| 16 | LIBS= | 16 | LIBS= |
| 17 | DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE | 17 | DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE |
| 18 | TOOLS=qemu-img$(EXESUF) | 18 | TOOLS=qemu-img$(EXESUF) |
configure
| @@ -243,11 +243,6 @@ for opt do | @@ -243,11 +243,6 @@ for opt do | ||
| 243 | esac | 243 | esac |
| 244 | done | 244 | done |
| 245 | 245 | ||
| 246 | -# Checking for CFLAGS | ||
| 247 | -if test -z "$CFLAGS"; then | ||
| 248 | - CFLAGS="-O2" | ||
| 249 | -fi | ||
| 250 | - | ||
| 251 | if test x"$show_help" = x"yes" ; then | 246 | if test x"$show_help" = x"yes" ; then |
| 252 | cat << EOF | 247 | cat << EOF |
| 253 | 248 |