Try less complicated trick for solving the dSYM glob portability issue.
This commit is contained in:
parent
63df248414
commit
86dfca278d
11
mk/host.mk
11
mk/host.mk
|
@ -31,7 +31,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB) \
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB) \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
|
|
||||||
$$(HLIB$(2)_H_$(4))
|
$$(HLIB$(2)_H_$(4))
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
|
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
|
||||||
|
@ -43,7 +42,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
|
||||||
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \
|
|
||||||
$$(HLIB$(2)_H_$(4))
|
$$(HLIB$(2)_H_$(4))
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
|
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
|
||||||
|
@ -56,15 +54,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
|
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
|
|
||||||
# we use Make's $$(wildcard) facility. The reason is that, on mac, when using
|
|
||||||
# USE_SNAPSHOT_CORELIB, we copy the core.dylib file out of the snapshot.
|
|
||||||
# In that case, there is no .dSYM file. Annoyingly, bash then refuses to expand
|
|
||||||
# glob, and cp reports an error because libcore-*.dylib.dsym does not exist.
|
|
||||||
# Make instead expands the glob to nothing, which gives us the correct behavior.
|
|
||||||
# (Copy .dsym file if it exists, but do nothing otherwise)
|
|
||||||
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_GLOB) \
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_GLOB) \
|
||||||
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \
|
|
||||||
$$(HLIB$(2)_H_$(4))
|
$$(HLIB$(2)_H_$(4))
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
|
$$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
|
||||||
|
@ -74,7 +64,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
|
||||||
@$$(call E, cp: $$@)
|
@$$(call E, cp: $$@)
|
||||||
$$(Q)cp $$< $$@
|
$$(Q)cp $$< $$@
|
||||||
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB) \
|
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB) \
|
||||||
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB)) \
|
|
||||||
$$(HLIB$(2)_H_$(4))
|
$$(HLIB$(2)_H_$(4))
|
||||||
|
|
||||||
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
|
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
|
||||||
|
|
|
@ -76,8 +76,8 @@ endif
|
||||||
|
|
||||||
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
|
ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
|
||||||
CFG_LIB_NAME=lib$(1).dylib
|
CFG_LIB_NAME=lib$(1).dylib
|
||||||
CFG_LIB_GLOB=lib$(1)-*.dylib
|
# needs trailing * to pick up the .dSYM file too
|
||||||
CFG_LIB_DSYM_GLOB=lib$(1)-*.dylib.dSYM
|
CFG_LIB_GLOB=lib$(1)-*.dylib*
|
||||||
CFG_UNIXY := 1
|
CFG_UNIXY := 1
|
||||||
CFG_LDENV := DYLD_LIBRARY_PATH
|
CFG_LDENV := DYLD_LIBRARY_PATH
|
||||||
CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
|
CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
|
||||||
|
|
Loading…
Reference in New Issue