mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 09:02:50 -06:00
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:
12
src/Makefile
12
src/Makefile
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user