Permalink
Browse files

Merge branch 'master' of https://github.com/gerdr/nqp

  • Loading branch information...
2 parents a78780c + cae6f61 commit af021f42d2c065e186997d7c394ec5aa1dd0c552 @moritz moritz committed May 4, 2013
Showing with 10 additions and 7 deletions.
  1. +10 −7 3rdparty/dyncall/buildsys/gmake/tool/gcc.gmake
@@ -46,18 +46,21 @@ endif
# --- Assemble ----------------------------------------------------------------
# FIXME:
-# Windows filenames are case-insensitive, ie %.s and %.S match the same files
+# Windows filenames are case-insensitive, ie %.s and %.S match the same files.
+# Additionally, mingw32-make 3.81 (which ships with older versions of
+# Strawberry Perl) is subtly different from gmake 3.82 (which ships with newer
+# ones).
#
-# For now, just put the %.S rule after the %.s rule: apparently, GNU make will
-# execute the rule defined last, and $(COMPILE.S) works for .s files as well
-# (see dyncall/README-Developer.txt)
-
-$(BUILD_DIR)/%.o: %.s
- $(COMPILE.s) $(OUTPUT_OPTION) $<
+# Putting the %.s rule after the %.S rule and using $(COMPILE.S) for both
+# .s and .S files (which should be ok - see dyncall/README-Developer.txt)
+# was the only combination I could get to work.
$(BUILD_DIR)/%.o: %.S
$(COMPILE.S) $(OUTPUT_OPTION) $<
+$(BUILD_DIR)/%.o: %.s
+ $(COMPILE.S) $(OUTPUT_OPTION) $<
+
# auto-dependency: disabled, due to problems when including *.d files, see targets.gmake for details
# $(CC) -MM -MT $@ $(CPPFLAGS) $< > $(BUILD_DIR)/$*.d

0 comments on commit af021f4

Please sign in to comment.