Skip to content

Commit

Permalink
Merge pull request swiftlang#8537 from adrian-prantl/cherry-pick-next…
Browse files Browse the repository at this point in the history
…-Rewrite-test-to-not-depend-on-a-compiler-bug

[Cherry-pick into next] Rewrite test to not depend on a compiler bug
  • Loading branch information
adrian-prantl authored Apr 3, 2024
2 parents f46a9e8 + 0459c98 commit 4f6d1e4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion lldb/packages/Python/lldbsuite/test/make/Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,9 @@ $(EXE): $(OBJECTS)
ifneq "$(CODESIGN)" ""
$(CODESIGN) -s - "$(EXE)"
endif
ifneq "$(HIDE_SWIFTMODULE)" ""
rm -f $(MODULENAME).swiftmodule
endif
else # OS = Linux
ifeq "$(HIDE_SWIFTMODULE)" ""
WRAPPED_SWIFTMODULE = $(MODULENAME).o
Expand All @@ -777,7 +780,9 @@ endif
$(EXE): $(OBJECTS)
@echo "### Linking" $(EXE)
$(SWIFTC) $(LD_EXTRAS) $(LD_SWIFTFLAGS) $(WRAPPED_SWIFTMODULE) $^ $(patsubst -g,,$(SWIFTFLAGS)) -o "$(EXE)"

ifneq "$(HIDE_SWIFTMODULE)" ""
rm -f $(MODULENAME).swiftmodule
endif
endif

else # USESWIFTDRIVER = 0
Expand Down
2 changes: 1 addition & 1 deletion lldb/test/API/lang/swift/expression/missing_type/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SWIFT_SOURCES := main.swift
SWIFTFLAGS_EXTRAS := -experimental-skip-non-inlinable-function-bodies-without-types
HIDE_SWIFTMODULE := YES
include Makefile.rules

0 comments on commit 4f6d1e4

Please sign in to comment.