ソースを参照

Fix the RTL directory for old OSes that use OS_TARGET only for rtlppulogs rule

git-svn-id: trunk@37210 -
pierre 7 年 前
コミット
89b3f6c86a
2 ファイル変更6 行追加2 行削除
  1. 3 1
      compiler/Makefile
  2. 3 1
      compiler/Makefile.fpc

+ 3 - 1
compiler/Makefile

@@ -4333,7 +4333,7 @@ PPUDIR=$(COMPILER_UNITTARGETDIR)
 ALLPPUDIR=$(CPU_TARGET)/units/*
 ALLPPUDIR=$(CPU_TARGET)/units/*
 PPULIST=$(wildcard $(PPUDIR)/*.ppu)
 PPULIST=$(wildcard $(PPUDIR)/*.ppu)
 PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
 PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
-RTLPPUDIR=../rtl/units/$(FULL_TARGET)
+RTLPPUDIR=../rtl/units/$(TARGETSUFFIX)
 RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
 RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
 RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
 RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
 .PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump
 .PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump
@@ -4348,6 +4348,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
 ppuinfo :
 ppuinfo :
 	echo PPU list is "$(PPULIST)"
 	echo PPU list is "$(PPULIST)"
 	echo PPULOG list is "$(PPULOGLIST)"
 	echo PPULOG list is "$(PPULOGLIST)"
+	echo RTLPPUDIR is "$(RTLPPUDIR)"
+	echo RTLPPU list is "$(RTLPPULIST)"
 cleanppulogs :
 cleanppulogs :
 	-$(RMPROG) $(PPULOGLIST)
 	-$(RMPROG) $(PPULOGLIST)
 cleanrtlppulogs :
 cleanrtlppulogs :

+ 3 - 1
compiler/Makefile.fpc

@@ -912,7 +912,7 @@ ALLPPUDIR=$(CPU_TARGET)/units/*
 PPULIST=$(wildcard $(PPUDIR)/*.ppu)
 PPULIST=$(wildcard $(PPUDIR)/*.ppu)
 PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
 PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
 
 
-RTLPPUDIR=../rtl/units/$(FULL_TARGET)
+RTLPPUDIR=../rtl/units/$(TARGETSUFFIX)
 RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
 RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
 RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
 RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
 
 
@@ -936,6 +936,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
 ppuinfo :
 ppuinfo :
 	echo PPU list is "$(PPULIST)"
 	echo PPU list is "$(PPULIST)"
 	echo PPULOG list is "$(PPULOGLIST)"
 	echo PPULOG list is "$(PPULOGLIST)"
+	echo RTLPPUDIR is "$(RTLPPUDIR)"
+	echo RTLPPU list is "$(RTLPPULIST)"
 
 
 cleanppulogs :
 cleanppulogs :
 	-$(RMPROG) $(PPULOGLIST)
 	-$(RMPROG) $(PPULOGLIST)