This is an archive of the discontinued LLVM Phabricator instance.

Differential D6176

[compiler-rt] Use @rpath for ASan dylib in Makefiles
ClosedPublic

Authored by kubamracek on Nov 7 2014, 2:09 PM.

Download Raw Diff

Details

Reviewers

samsonov

Summary

We already did the same for CMake build, in http://reviews.llvm.org/D6018. Let's fix the Makefiles as well.

Diff Detail

Event Timeline

kubamracek updated this revision to Diff 15938.Nov 7 2014, 2:09 PM

kubamracek retitled this revision from to [compiler-rt] Use @rpath for ASan dylib in Makefiles.

kubamracek updated this object.

kubamracek edited the test plan for this revision. (Show Details)

kubamracek added subscribers: Unknown Object (MLST), glider, samsonov.

LGTM

This revision is now accepted and ready to land.Nov 7 2014, 2:27 PM

Landed in r221556 and r221557.

Revision Contents

Path

Size

projects/

compiler-rt/

make/

platform/

clang_darwin.mk

4 lines

tools/

clang/

runtime/

compiler-rt/

Makefile

2 lines

Diff 15938

projects/compiler-rt/make/platform/clang_darwin.mk

	Show All 32 Lines
	CFLAGS.profile_ios.x86_64h := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)			CFLAGS.profile_ios.x86_64h := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
	CFLAGS.profile_ios.armv7 := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)			CFLAGS.profile_ios.armv7 := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
	CFLAGS.profile_ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)			CFLAGS.profile_ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
	CFLAGS.profile_ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)			CFLAGS.profile_ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
	CFLAGS.profile_ios.arm64 := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)			CFLAGS.profile_ios.arm64 := $(CFLAGS) $(IOS6_DEPLOYMENT_ARGS)

	# Configure the asan_osx_dynamic library to be built shared.			# Configure the asan_osx_dynamic library to be built shared.
	SHARED_LIBRARY.asan_osx_dynamic := 1			SHARED_LIBRARY.asan_osx_dynamic := 1
	LDFLAGS.asan_osx_dynamic := -lstdc++ -undefined dynamic_lookup			LDFLAGS.asan_osx_dynamic := -lstdc++ -undefined dynamic_lookup -install_name @rpath/libclang_rt.asan_osx_dynamic.dylib

	# Configure the asan_iossim_dynamic library to be built shared.			# Configure the asan_iossim_dynamic library to be built shared.
	SHARED_LIBRARY.asan_iossim_dynamic := 1			SHARED_LIBRARY.asan_iossim_dynamic := 1
	# configure+make uses Clang, so we're using isysroot instead of --sysroot			# configure+make uses Clang, so we're using isysroot instead of --sysroot
	# or -Wl,-syslibroot.			# or -Wl,-syslibroot.
	LDFLAGS.asan_iossim_dynamic := -undefined dynamic_lookup \			LDFLAGS.asan_iossim_dynamic := -undefined dynamic_lookup -install_name @rpath/libclang_rt.asan_iossim_dynamic.dylib \
	-Wl,-ios_simulator_version_min,7.0.0 \			-Wl,-ios_simulator_version_min,7.0.0 \
	-mios-simulator-version-min=7.0 -isysroot $(IOSSIM_SDK_PATH)			-mios-simulator-version-min=7.0 -isysroot $(IOSSIM_SDK_PATH)

	FUNCTIONS.eprintf := eprintf			FUNCTIONS.eprintf := eprintf
	FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf			FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf

	FUNCTIONS.ios := divmodsi4 udivmodsi4 mulosi4 mulodi4 muloti4			FUNCTIONS.ios := divmodsi4 udivmodsi4 mulosi4 mulodi4 muloti4
	# On x86, the divmod functions reference divsi.			# On x86, the divmod functions reference divsi.
	Show All 32 Lines

tools/clang/runtime/compiler-rt/Makefile

	Show All 32 Lines
	$(ResourceLibDir)/$1/.dir			$(ResourceLibDir)/$1/.dir
	$(Echo) Copying runtime library $1/$$* to build dir			$(Echo) Copying runtime library $1/$$* to build dir
	$(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.so $$@			$(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.so $$@
	$(ResourceLibDir)/$1/libclang_rt.%.dylib: \			$(ResourceLibDir)/$1/libclang_rt.%.dylib: \
	$(PROJ_OBJ_DIR)/clang_$1/%/libcompiler_rt.dylib \			$(PROJ_OBJ_DIR)/clang_$1/%/libcompiler_rt.dylib \
	$(ResourceLibDir)/$1/.dir			$(ResourceLibDir)/$1/.dir
	$(Echo) Copying runtime library $1/$$* to build dir			$(Echo) Copying runtime library $1/$$* to build dir
	$(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.dylib $$@			$(Verb) cp $(PROJ_OBJ_DIR)/clang_$1/$$*/libcompiler_rt.dylib $$@
	$(Echo) Fixing LC_ID_DYLIB of $$@
	$(Verb) install_name_tool $$@ -id $$@
	RuntimeLibrary.$1: \			RuntimeLibrary.$1: \
	$(RuntimeLibrary.$1.Configs:%=$(ResourceLibDir)/$1/libclang_rt.%)			$(RuntimeLibrary.$1.Configs:%=$(ResourceLibDir)/$1/libclang_rt.%)
	.PHONY: RuntimeLibrary.$1			.PHONY: RuntimeLibrary.$1

	$(PROJ_resources_lib)/$1: $(PROJ_resources_lib)			$(PROJ_resources_lib)/$1: $(PROJ_resources_lib)
	$(Verb) $(MKDIR) $$@			$(Verb) $(MKDIR) $$@

	$(PROJ_resources_lib)/$1/libclang_rt.%.a: \			$(PROJ_resources_lib)/$1/libclang_rt.%.a: \
	Show All 32 Lines