mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-16 22:35:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug which occurred when combining --target asm with --use-subdirs.

Browse Source 
Branches: main, release
Estimated hours taken: 1

Fix a bug which occurred when combining --target asm with --use-subdirs.

scripts/Mmake.rules:
compiler/modules.m:
	The .pic_s files go in the `pic_ss' subdirectory,
	not in the `ss' subdirectory.

scripts/Mmake.vars.in:
	Add `pic_ss_subdir' variable.
This commit is contained in:
Fergus Henderson
2001-07-27 16:06:29 +00:00
parent 080a9de8e1
commit 8b45bd6016
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/Mmake.rules
View File

@@ -192,7 +192,7 @@ ifeq ($(TARGET_ASM),yes)
$(ss_subdir)%.s : $(s_dates_subdir)%.s_date
@:
$(ss_subdir)%.pic_s : $(pic_s_dates_subdir)%.pic_s_date
$(pic_ss_subdir)%.pic_s : $(pic_s_dates_subdir)%.pic_s_date
@:
$(s_dates_subdir)%.s_date : %.m
@@ -206,7 +206,7 @@ $(pic_s_dates_subdir)%.pic_s_date : %.m
$(os_subdir)%.$O : $(ss_subdir)%.s
$(AS) $< $(OBJFILE_OPT)$@
$(os_subdir)%.pic_o : $(ss_subdir)%.pic_s
$(os_subdir)%.pic_o : $(pic_ss_subdir)%.pic_s
$(AS) $< $(OBJFILE_OPT)$@
# For *__c_code.{o,pic_o}, we depend on the .s or .pic_s file rather
@@ -217,7 +217,7 @@ $(os_subdir)%__c_code.$O : $(ss_subdir)%.s
$(MGNUC) $(ALL_GRADEFLAGS) $(ALL_MGNUCFLAGS) \
-c $(cs_subdir)$*.c $(OBJFILE_OPT)$@
$(os_subdir)%__c_code.pic_o : $(ss_subdir)%.pic_s
$(os_subdir)%__c_code.pic_o : $(pic_ss_subdir)%.pic_s
$(MGNUC) $(ALL_GRADEFLAGS) $(ALL_MGNUCFLAGS) $(CFLAGS_FOR_PIC) \
-c $(cs_subdir)$*.c $(OBJFILE_OPT)$@