Add optP/optl flags only when needed, and last to avoid ghc 6.2.1

Add optP/optl flags only when needed, and last to avoid ghc 6.2.1
problems.
This commit is contained in:
bringert
2005-05-12 09:21:26 +00:00
parent ae60299c7d
commit c7b82c43e2

View File

@@ -3,8 +3,7 @@ include config.mk
GHMAKE=$(GHC) --make GHMAKE=$(GHC) --make
GHCXMAKE=ghcxmake GHCXMAKE=ghcxmake
#GHCFLAGS= -package util -fglasgow-exts -optP'$(CPPFLAGS)' -optl'$(LDFLAGS)' GHCFLAGS= -fglasgow-exts -package util
GHCFLAGS= -package util -fglasgow-exts
GHCOPTFLAGS=-O2 GHCOPTFLAGS=-O2
GHCFUDFLAG= GHCFUDFLAG=
JAVAFLAGS=-target 1.4 -source 1.4 JAVAFLAGS=-target 1.4 -source 1.4
@@ -30,6 +29,15 @@ ifeq ("$(READLINE)","readline")
GHCFLAGS += -package readline -DUSE_READLINE GHCFLAGS += -package readline -DUSE_READLINE
endif endif
ifneq ("$(CPPFLAGS)","")
GHCFLAGS += -optP'$(CPPFLAGS)'
endif
ifneq ("$(LDFLAGS)","")
GHCFLAGS += -optl'$(LDFLAGS)'
endif
ifeq ("$(ENABLE_JAVA)", "yes") ifeq ("$(ENABLE_JAVA)", "yes")
BUILD_JAR=jar BUILD_JAR=jar
else else