File tree Expand file tree Collapse file tree 5 files changed +11
-9
lines changed
packages/Python/lldbsuite/test/make
commands/target/auto-install-main-executable
bundle-with-dot-in-filename Expand file tree Collapse file tree 5 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -339,9 +339,11 @@ endif
339339# library to make ASAN tests work for most users, including the bots.
340340ifeq "$(OS)" "Darwin"
341341ifneq "$(ASAN_OPTIONS)" ""
342- LDFLAGS + = -Wl,-lto_library -Wl,$(shell dirname $(shell xcrun -find clang))/../lib/libLTO.dylib
342+ ASAN_LDFLAGS = -Wl,-lto_library -Wl,$(shell dirname $(shell xcrun -find clang))/../lib/libLTO.dylib
343343endif
344344endif
345+ LDFLAGS += $(ASAN_LDFLAGS)
346+
345347OBJECTS =
346348EXE ?= a.out
347349
Original file line number Diff line number Diff line change @@ -6,4 +6,4 @@ a.out: a.device.out
66include Makefile.rules
77
88a.device.out :
9- $(CXX ) $(CXXFLAGS ) -DBUILD=74 -o $@ $(SRCDIR ) /main.cpp
9+ $(CXX ) $(ASAN_LDFLAGS ) $( CXXFLAGS ) -DBUILD=74 -o $@ $(SRCDIR ) /main.cpp
Original file line number Diff line number Diff line change @@ -5,15 +5,15 @@ all: clean $(EXE)
55include Makefile.rules
66
77$(EXE ) :
8- $(CC ) $(CFLAGS ) -dynamiclib -o com.apple.sbd $(SRCDIR ) /bundle.c
8+ $(CC ) $(ASAN_LDFLAGS ) $( CFLAGS ) -dynamiclib -o com.apple.sbd $(SRCDIR ) /bundle.c
99 mkdir com.apple.sbd.xpc
1010 mv com.apple.sbd com.apple.sbd.xpc/
1111 mkdir -p com.apple.sbd.xpc.dSYM/Contents/Resources/DWARF
1212 mv com.apple.sbd.dSYM/Contents/Resources/DWARF/com.apple.sbd com.apple.sbd.xpc.dSYM/Contents/Resources/DWARF/
1313 rm -rf com.apple.sbd.dSYM
1414 mkdir hide.app
1515 tar cf - com.apple.sbd.xpc com.apple.sbd.xpc.dSYM | ( cd hide.app; tar xBpf -)
16- $(CC ) $(CFLAGS ) -o find-bundle-with-dots-in-fn $(SRCDIR ) /main.c
16+ $(CC ) $(ASAN_LDFLAGS ) $( CFLAGS ) -o find-bundle-with-dots-in-fn $(SRCDIR ) /main.c
1717
1818clean ::
1919 rm -rf a.out a.out.dSYM hide.app com.apple.sbd com.apple.sbd.dSYM com.apple.sbd.xpc com.apple.sbd.xpc.dSYM find-bundle-with-dots-in-fn find-bundle-with-dots-in-fn.dSYM
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ all: clean $(EXE)
44include Makefile.rules
55
66$(EXE ) :
7- $(CC ) $(CFLAGS ) -install_name $(shell pwd) /MyFramework.framework/Versions/A/MyFramework -dynamiclib -o MyFramework $(SRCDIR ) /myframework.c
7+ $(CC ) $(ASAN_LDFLAGS ) $( CFLAGS ) -install_name $(shell pwd) /MyFramework.framework/Versions/A/MyFramework -dynamiclib -o MyFramework $(SRCDIR ) /myframework.c
88 mkdir -p MyFramework.framework/Versions/A/Headers
99 mkdir -p MyFramework.framework/Versions/A/Resources
1010 cp MyFramework MyFramework.framework/Versions/A
@@ -18,7 +18,7 @@ $(EXE):
1818 mkdir hide.app
1919 rm -f MyFramework
2020 tar cf - MyFramework.framework MyFramework.framework.dSYM | ( cd hide.app; tar xBpf -)
21- $(CC ) $(CFLAGS ) -o deep-bundle $(SRCDIR ) /main.c -F. -framework MyFramework
21+ $(CC ) $(ASAN_LDFLAGS ) $( CFLAGS ) -o deep-bundle $(SRCDIR ) /main.c -F. -framework MyFramework
2222
2323clean ::
2424 rm -rf a.out a.out.dSYM deep-bundle deep-bundle.dSYM MyFramework.framework MyFramework.framework.dSYM MyFramework MyFramework.dSYM hide.app
Original file line number Diff line number Diff line change @@ -6,13 +6,13 @@ include Makefile.rules
66all : fat.out
77
88x86_64.out : x86_64.c
9- $(CC ) -isysroot $(SDKROOT ) -target x86_64-apple-macosx10.9 -o x86_64.out $<
9+ $(CC ) $( ASAN_LDFLAGS ) -isysroot $(SDKROOT ) -target x86_64-apple-macosx10.9 -o x86_64.out $<
1010
1111x86_64h.out : x86_64h.c
12- $(CC ) -isysroot $(SDKROOT ) -target x86_64h-apple-macosx10.9 -o x86_64h.out $<
12+ $(CC ) $( ASAN_LDFLAGS ) -isysroot $(SDKROOT ) -target x86_64h-apple-macosx10.9 -o x86_64h.out $<
1313
1414arm64.out : arm64.c
15- $(CC ) -isysroot $(SDKROOT ) -target arm64-apple-macosx10.9 -o arm64.out $<
15+ $(CC ) $( ASAN_LDFLAGS ) -isysroot $(SDKROOT ) -target arm64-apple-macosx10.9 -o arm64.out $<
1616
1717fat.out : x86_64.out x86_64h.out arm64.out
1818 $(LIPO ) -o fat.out -create $^
You can’t perform that action at this time.
0 commit comments