diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Compile/Compile.hs | 5 | ||||
| -rw-r--r-- | src/Makefile | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs index 8057904a8..b320a46f1 100644 --- a/src/GF/Compile/Compile.hs +++ b/src/GF/Compile/Compile.hs @@ -266,10 +266,11 @@ generateModuleCode opts path minfo@(name,info) = do code <- return $ MkGFC.prCanonModInfo minfo' return (gfcFile pname, code) if isCompilable info && emit && nomulti - then ioeIO $ writeFile file out >> putStr (" wrote file" +++ file) - else ioeIO $ putStrFlush $ "no need to save module" +++ prt name + then ioeIO (writeFile file out) >> ioeIOIf (putStr (" wrote file" +++ file)) + else ioeIOIf $ putStrFlush $ "no need to save module" +++ prt name return minfo' where + ioeIOIf = if oElem beSilent opts then (const (return ())) else ioeIO emitsGFR m = isModRes m && isCompilable info ---- isModRes m || (isModCnc m && mstatus m == MSIncomplete) isCompilable mi = case mi of diff --git a/src/Makefile b/src/Makefile index ce5873e52..cb7593c55 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,8 +4,7 @@ include config.mk GHMAKE=$(GHC) --make GHCXMAKE=ghcxmake GHCFLAGS=-package lang -package util -fglasgow-exts $(CPPFLAGS) $(LDFLAGS) -GHCOPTFLAGS=$(GHCFLAGS) -##GHCOPTFLAGS=-O $(GHCFLAGS) +GHCOPTFLAGS=-O $(GHCFLAGS) GHCFUDFLAG= JAVAFLAGS=-target 1.4 -source 1.4 @@ -29,6 +28,8 @@ BIN_DIST_DIR=$(DIST_DIR)-$(host) all: unix +temp: today noopt + unix: today nofud-links opt windows: today nofud-links justwindows @@ -41,6 +42,10 @@ opt: $(GHMAKE) $(GHCOPTFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf strip gf mv gf ../bin/ +noopt: + $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf + strip gf + mv gf ../bin/ ghc: nofud |