Browse Source

* unexport FPC_VERSION
* regenerate so RELEASE=1 doesn't set optimzier for 0.99.12

peter 25 years ago
parent
commit
0750e58848
2 changed files with 12 additions and 8 deletions
  1. 11 7
      compiler/Makefile
  2. 1 1
      compiler/Makefile.fpc

+ 11 - 7
compiler/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 [2000/01/18]
+# Makefile generated by fpcmake v0.99.13 [2000/01/25]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -117,7 +117,7 @@ export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
 #####################################################################
 #####################################################################
 
 
 # Don't export OS_SOURCE because it can change after the first compile
 # Don't export OS_SOURCE because it can change after the first compile
-unexport OS_SOURCE
+unexport OS_SOURCE FPC_VERSION
 
 
 # Allow ALPHA, POWERPC, M68K, I386 defines for target cpu
 # Allow ALPHA, POWERPC, M68K, I386 defines for target cpu
 ifdef ALPHA
 ifdef ALPHA
@@ -719,7 +719,6 @@ endif
 # Redirection
 # Redirection
 #####################################################################
 #####################################################################
 
 
-# Release ? Then force OPT and don't use extra opts via commandline
 ifndef REDIRFILE
 ifndef REDIRFILE
 REDIRFILE=log
 REDIRFILE=log
 endif
 endif
@@ -774,9 +773,14 @@ override FPCOPT+=-g -dDEBUG
 endif
 endif
 
 
 # Release mode (strip, optimize and don't load ppc386.cfg)
 # Release mode (strip, optimize and don't load ppc386.cfg)
+# 0.99.12b has a bug in the optimizer so don't use it by default
 ifdef RELEASE
 ifdef RELEASE
+ifeq ($(FPC_VERSION),0.99.12)
+override FPCOPT+=-Xs -OGp3 -n
+else
 override FPCOPT+=-Xs -OG2p3 -n
 override FPCOPT+=-Xs -OG2p3 -n
 endif
 endif
+endif
 
 
 # Verbose settings (warning,note,info)
 # Verbose settings (warning,note,info)
 ifdef VERBOSE
 ifdef VERBOSE
@@ -878,19 +882,19 @@ fpc_debug:
 
 
 %$(PPUEXT): %.pp
 %$(PPUEXT): %.pp
 	$(COMPILER) $< $(REDIR)
 	$(COMPILER) $< $(REDIR)
-	$(EXECPASS)
+	$(EXECPPAS)
 
 
 %$(PPUEXT): %.pas
 %$(PPUEXT): %.pas
 	$(COMPILER) $< $(REDIR)
 	$(COMPILER) $< $(REDIR)
-	$(EXECPASS)
+	$(EXECPPAS)
 
 
 %$(EXEEXT): %.pp
 %$(EXEEXT): %.pp
 	$(COMPILER) $< $(REDIR)
 	$(COMPILER) $< $(REDIR)
-	$(EXECPASS)
+	$(EXECPPAS)
 
 
 %$(EXEEXT): %.pas
 %$(EXEEXT): %.pas
 	$(COMPILER) $< $(REDIR)
 	$(COMPILER) $< $(REDIR)
-	$(EXECPASS)
+	$(EXECPPAS)
 
 
 #####################################################################
 #####################################################################
 # Library
 # Library

+ 1 - 1
compiler/Makefile.fpc

@@ -23,7 +23,7 @@ toolupx=1
 
 
 [presettings]
 [presettings]
 # Don't export OS_SOURCE because it can change after the first compile
 # Don't export OS_SOURCE because it can change after the first compile
-unexport OS_SOURCE
+unexport OS_SOURCE FPC_VERSION
 
 
 # Allow ALPHA, POWERPC, M68K, I386 defines for target cpu
 # Allow ALPHA, POWERPC, M68K, I386 defines for target cpu
 ifdef ALPHA
 ifdef ALPHA