From 1ee230e6c137166fa6c3b3e6a8cc37863c76e84b Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 10 Jul 2012 19:06:58 -0700 Subject: [PATCH 1/8] Tweak release notes. --- RELEASES.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASES.txt b/RELEASES.txt index 842190e6ffe8..a0498b106e2c 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -1,7 +1,7 @@ -Version 0.3 (July 2012) - not yet! ------------------------------------ +Version 0.3 (July 2012) +------------------------ - * ~1500 changes, numerous bugfixes + * ~1900 changes, numerous bugfixes * New coding conveniences * Integer-literal suffix inference @@ -33,7 +33,7 @@ Version 0.3 (July 2012) - not yet! * Removal of various obsolete features * Keywords: 'be', 'prove', 'syntax', 'note', 'mutable', 'bind', - 'crust', 'native' (now 'extern') + 'crust', 'native' (now 'extern'), 'cont' (now 'again') * Constructs: do-while loops ('do' repurposed), fn binding, resources (replaced by destructors) From aa7b3cc9297d734fd60d0dac756187852931b5a9 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 11 Jul 2012 09:09:08 -0700 Subject: [PATCH 2/8] Fix some version numbers. --- src/cargo/cargo.rc | 10 +++++----- src/compiletest/compiletest.rc | 4 ++-- src/etc/pkg/rust.iss | 2 +- src/fuzzer/fuzzer.rc | 6 +++--- src/libcore/core.rc | 2 +- src/libcore/core.rs | 2 +- src/libstd/std.rc | 4 ++-- src/libsyntax/syntax.rc | 6 +++--- src/rustc/driver/rustc.rs | 8 ++++---- src/rustc/rustc.rc | 8 ++++---- src/rustdoc/rustdoc.rc | 10 +++++----- src/test/run-pass/use.rs | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/cargo/cargo.rc b/src/cargo/cargo.rc index a23b6a2ff510..29885db78767 100644 --- a/src/cargo/cargo.rc +++ b/src/cargo/cargo.rc @@ -11,7 +11,7 @@ // End: #[link(name = "cargo", - vers = "0.2", + vers = "0.3", uuid = "9ff87a04-8fed-4295-9ff8-f99bb802650b", url = "https://github.com/mozilla/rust/tree/master/src/cargo")]; @@ -21,10 +21,10 @@ #[warn(no_non_implicitly_copyable_typarams,no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); -use rustc(vers = "0.2"); -use syntax(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); +use rustc(vers = "0.3"); +use syntax(vers = "0.3"); import core::*; diff --git a/src/compiletest/compiletest.rc b/src/compiletest/compiletest.rc index d4c4cb482e06..e2efee981daa 100644 --- a/src/compiletest/compiletest.rc +++ b/src/compiletest/compiletest.rc @@ -4,8 +4,8 @@ #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); import core::*; diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index d7bd716c8ba5..bb5ceee32075 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -5,7 +5,7 @@ SetupIconFile=rust-logo.ico AppName=Rust AppVersion={#CFG_VERSION} -AppCopyright=Copyright (C) 2006-2011 Mozilla Foundation, MIT license +AppCopyright=Copyright (C) 2006-2012 Mozilla Foundation, MIT license AppPublisher=Mozilla Foundation AppPublisherURL=http://www.rust-lang.org VersionInfoVersion={#CFG_VERSION} diff --git a/src/fuzzer/fuzzer.rc b/src/fuzzer/fuzzer.rc index 1a5630b0e2f8..7b9f6bccb775 100644 --- a/src/fuzzer/fuzzer.rc +++ b/src/fuzzer/fuzzer.rc @@ -6,9 +6,9 @@ #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); -use syntax(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); +use syntax(vers = "0.3"); import core::*; diff --git a/src/libcore/core.rc b/src/libcore/core.rc index d17cef756295..8bac6aa9cdb0 100644 --- a/src/libcore/core.rc +++ b/src/libcore/core.rc @@ -1,5 +1,5 @@ #[link(name = "core", - vers = "0.2", + vers = "0.3", uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8", url = "https://github.com/mozilla/rust/tree/master/src/libcore")]; diff --git a/src/libcore/core.rs b/src/libcore/core.rs index e70a092d876a..7e0ab17df17f 100644 --- a/src/libcore/core.rs +++ b/src/libcore/core.rs @@ -59,7 +59,7 @@ mod core { // Similar to above. Some magic to make core testable. #[cfg(test)] mod std { - use std(vers = "0.2"); + use std(vers = "0.3"); import std::test; } diff --git a/src/libstd/std.rc b/src/libstd/std.rc index 2a27d5620f1c..c6aa808ebfd2 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -1,5 +1,5 @@ #[link(name = "std", - vers = "0.2", + vers = "0.3", uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297", url = "https://github.com/mozilla/rust/tree/master/src/libstd")]; @@ -12,7 +12,7 @@ #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); +use core(vers = "0.3"); import core::*; export net, net_tcp, net_ip; diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc index b1a1677dfed7..99a877a82ac1 100644 --- a/src/libsyntax/syntax.rc +++ b/src/libsyntax/syntax.rc @@ -1,5 +1,5 @@ #[link(name = "syntax", - vers = "0.2", + vers = "0.3", uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")]; @@ -10,8 +10,8 @@ #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); import core::*; diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs index bea8f6c28e98..5a9c6774db5e 100644 --- a/src/rustc/driver/rustc.rs +++ b/src/rustc/driver/rustc.rs @@ -1,10 +1,10 @@ #[no_core]; #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); -use rustc(vers = "0.2"); -use syntax(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); +use rustc(vers = "0.3"); +use syntax(vers = "0.3"); import core::*; diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc index 7d305814c36c..8184f60c11f2 100644 --- a/src/rustc/rustc.rc +++ b/src/rustc/rustc.rc @@ -1,7 +1,7 @@ // -*- rust -*- #[link(name = "rustc", - vers = "0.2", + vers = "0.3", uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf", url = "https://github.com/mozilla/rust/tree/master/src/rustc")]; @@ -13,9 +13,9 @@ #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); -use syntax(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); +use syntax(vers = "0.3"); import core::*; diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc index ab8f770e87f6..c22f7b06d73e 100644 --- a/src/rustdoc/rustdoc.rc +++ b/src/rustdoc/rustdoc.rc @@ -1,7 +1,7 @@ //! Rustdoc - The Rust documentation generator #[link(name = "rustdoc", - vers = "0.2", + vers = "0.3", uuid = "f8abd014-b281-484d-a0c3-26e3de8e2412", url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")]; @@ -13,10 +13,10 @@ #[warn(no_vecs_not_implicitly_copyable)]; -use core(vers = "0.2"); -use std(vers = "0.2"); -use rustc(vers = "0.2"); -use syntax(vers = "0.2"); +use core(vers = "0.3"); +use std(vers = "0.3"); +use rustc(vers = "0.3"); +use syntax(vers = "0.3"); import core::*; diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs index 275cf09f0355..3bdede237ce2 100644 --- a/src/test/run-pass/use.rs +++ b/src/test/run-pass/use.rs @@ -1,7 +1,7 @@ #[no_core]; use core; use zed(name = "core"); -use bar(name = "core", vers = "0.2"); +use bar(name = "core", vers = "0.3"); import core::str; From 2cf6bf87c348f4a1079aa1c17e51eb45d9b89a5f Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 11 Jul 2012 12:10:54 -0700 Subject: [PATCH 3/8] Reorganize lib-glob code to avoid accidentally duplicating lib/ subdirectory. --- Makefile.in | 12 ++++-------- mk/clean.mk | 16 ++++++++-------- mk/host.mk | 19 ++++--------------- mk/install.mk | 37 +++++++++++++++++++++---------------- mk/platform.mk | 9 ++++----- 5 files changed, 41 insertions(+), 52 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3a762f1c00ff..0d31853af068 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,14 +118,10 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std) CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc) CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax) -STDLIB_GLOB :=$(call CFG_LIB_GLOB,std) -CORELIB_GLOB :=$(call CFG_LIB_GLOB,core) -LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc) -LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax) -STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std) -CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core) -LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc) -LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax) +STDLIB_GLOB =$(call CFG_LIB_GLOB,$(1),std) +CORELIB_GLOB =$(call CFG_LIB_GLOB,$(1),core) +LIBRUSTC_GLOB =$(call CFG_LIB_GLOB,$(1),rustc) +LIBSYNTAX_GLOB =$(call CFG_LIB_GLOB,$(1),syntax) # version-string calculation CFG_GIT_DIR := $(CFG_SRC_DIR).git diff --git a/mk/clean.mk b/mk/clean.mk index d36cbaf7d0bf..ba9b0db8e9d1 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -62,10 +62,10 @@ clean$(1)_H_$(2): $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX) - $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB) - $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB) - $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB) - $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB) + $(Q)rm -f $$(call CORELIB_GLOB,$$(HLIB$(1)_H_$(2))) + $(Q)rm -f $$(call STDLIB_GLOB,$$(HLIB$(1)_H_$(2)))) + $(Q)rm -f $$(call LIBRUSTC_GLOB,$$(HLIB$(1)_H_$(2))) + $(Q)rm -f $$(call LIBSYNTAX_GLOB,$$(HLIB$(1)_H_$(2))) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM) $(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib @@ -88,10 +88,10 @@ clean$(1)_T_$(2)_H_$(3): $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX) - $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB) - $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB) - $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB) - $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB) + $(Q)rm -f $$(call CORELIB_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) + $(Q)rm -f $$(call STDLIB_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) + $(Q)rm -f $$(call LIBRUSTC_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) + $(Q)rm -f $$(call LIBSYNTAX_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a diff --git a/mk/host.mk b/mk/host.mk index c71e48f6f120..d416b64e4948 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -30,8 +30,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \ $$(HSTDLIB_DEFAULT$(2)_H_$(3)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB) \ - $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \ + $$(Q)cp -R $$(call LIBRUSTC_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ $$(HLIB$(2)_H_$(4)) $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \ @@ -42,8 +41,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \ $$(HSTDLIB_DEFAULT$(2)_H_$(3)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \ - $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \ + $$(Q)cp -R $$(call LIBSYNTAX_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ $$(HLIB$(2)_H_$(4)) $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \ @@ -56,15 +54,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \ $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) @$$(call E, 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) \ - $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \ + $$(Q)cp -R $$(call CORELIB_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ $$(HLIB$(2)_H_$(4)) $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \ @@ -73,8 +63,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \ $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB) \ - $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_DSYM_GLOB)) \ + $$(Q)cp -R $$(call STDLIB_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ $$(HLIB$(2)_H_$(4)) $$(HLIB$(2)_H_$(4))/libcore.rlib: \ diff --git a/mk/install.mk b/mk/install.mk index 029fa30e7b8f..fe9428eade06 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -6,11 +6,12 @@ # destination directory as arg 2, and filename/libname-glob as arg 3 ifdef VERBOSE INSTALL = install -m755 $(1)/$(3) $(2)/$(3) - INSTALL_LIB = install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/ + INSTALL_LIB = install -m644 $(3) $(2)/ else INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3) - INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \ - install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/ + INSTALL_LIB = $(Q)$(call E, install_lib: \ + $(addprefix $(2)/,$(basename $(3)))) && \ + install -m644 $(3) $(2)/ endif # The stage we install from @@ -37,13 +38,17 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(Q)mkdir -p $$(PTL$(1)$(2)) $$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME)) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB)) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ + $$(call CORELIB_GLOB,$$(TL$(1)$(2)))) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB)) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ + $$(call STDLIB_GLOB,$$(TL$(1)$(2)))) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB)) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ + $$(call LIBRUSTC_GLOB,$$(TL$(1)$(2)))) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB)) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ + $$(call LIBSYNTAX_GLOB,$$(TL$(1)$(2)))) $$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a) endef @@ -74,10 +79,10 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE)) $(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X)) $(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME)) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB)) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB)) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB)) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB)) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call CORELIB_GLOB,$(PHL))) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call STDLIB_GLOB,$(PHL))) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call LIBRUSTC_GLOB,$(PHL))) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call LIBSYNTAX_GLOB,$(PHL))) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM)) $(Q)$(call INSTALL,$(S)/man, \ $(PREFIX_ROOT)/share/man/man1,rustc.1) @@ -86,7 +91,7 @@ install-targets: $(INSTALL_TARGET_RULES) HOST_LIB_FROM_HL_GLOB = \ - $(patsubst $(HL)/%,$(PHL)/%,$(wildcard $(HL)/$(1))) + $(patsubst $(HL)/%,$(PHL)/%,$(1)) uninstall: $(Q)rm -f $(PHB)/rustc$(X) @@ -95,10 +100,10 @@ uninstall: $(Q)rm -f $(PHL)/$(CFG_RUSTLLVM) $(Q)rm -f $(PHL)/$(CFG_RUNTIME) $(Q)for i in \ - $(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \ - $(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \ - $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \ - $(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(call CORELIB_GLOB,$(HL))) \ + $(call HOST_LIB_FROM_HL_GLOB,$(call STDLIB_GLOB,$(HL))) \ + $(call HOST_LIB_FROM_HL_GLOB,$(call LIBRUSTC_GLOB,$(HL))) \ + $(call HOST_LIB_FROM_HL_GLOB,$(call LIBSYNTAX_GLOB,$(HL))) \ ; \ do rm -f $$i ; \ done diff --git a/mk/platform.mk b/mk/platform.mk index 43a943347a57..fdc361a8a67c 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -21,7 +21,7 @@ CFG_DSYMUTIL := true ifneq ($(findstring freebsd,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).so - CFG_LIB_GLOB=lib$(1)-*.so + CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.so) CFG_GCCISH_CFLAGS += -fPIC -I/usr/local/include CFG_GCCISH_LINK_FLAGS += -shared -fPIC -lpthread -lrt CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list= @@ -40,7 +40,7 @@ endif ifneq ($(findstring linux,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).so - CFG_LIB_GLOB=lib$(1)-*.so + CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.so) CFG_GCCISH_CFLAGS += -fPIC CFG_GCCISH_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list= @@ -76,8 +76,7 @@ endif ifneq ($(findstring darwin,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).dylib - CFG_LIB_GLOB=lib$(1)-*.dylib - CFG_LIB_DSYM_GLOB=lib$(1)-*.dylib.dSYM + CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.dylib $(1)/lib$(2)-*.dylib.dSYM) CFG_UNIXY := 1 CFG_LDENV := DYLD_LIBRARY_PATH CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind @@ -174,7 +173,7 @@ ifdef CFG_WINDOWSY CFG_EXE_SUFFIX := .exe CFG_LIB_NAME=$(1).dll - CFG_LIB_GLOB=$(1)-*.dll + CFG_LIB_GLOB=$(wildcard $(1)/$(2)-*.dll) CFG_DEF_SUFFIX := .def ifdef MSYSTEM CFG_LDPATH :=$(CFG_LDPATH):$$PATH From 63df2484146a3f2e34aa743ac600eb82620cb70a Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 11 Jul 2012 15:04:32 -0700 Subject: [PATCH 4/8] Revert "Reorganize lib-glob code to avoid accidentally duplicating lib/ subdirectory." This reverts commit 2cf6bf87c348f4a1079aa1c17e51eb45d9b89a5f. --- Makefile.in | 12 ++++++++---- mk/clean.mk | 16 ++++++++-------- mk/host.mk | 19 +++++++++++++++---- mk/install.mk | 37 ++++++++++++++++--------------------- mk/platform.mk | 9 +++++---- 5 files changed, 52 insertions(+), 41 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0d31853af068..3a762f1c00ff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,10 +118,14 @@ CFG_STDLIB :=$(call CFG_LIB_NAME,std) CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc) CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax) -STDLIB_GLOB =$(call CFG_LIB_GLOB,$(1),std) -CORELIB_GLOB =$(call CFG_LIB_GLOB,$(1),core) -LIBRUSTC_GLOB =$(call CFG_LIB_GLOB,$(1),rustc) -LIBSYNTAX_GLOB =$(call CFG_LIB_GLOB,$(1),syntax) +STDLIB_GLOB :=$(call CFG_LIB_GLOB,std) +CORELIB_GLOB :=$(call CFG_LIB_GLOB,core) +LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc) +LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax) +STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std) +CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core) +LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc) +LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax) # version-string calculation CFG_GIT_DIR := $(CFG_SRC_DIR).git diff --git a/mk/clean.mk b/mk/clean.mk index ba9b0db8e9d1..d36cbaf7d0bf 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -62,10 +62,10 @@ clean$(1)_H_$(2): $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX) - $(Q)rm -f $$(call CORELIB_GLOB,$$(HLIB$(1)_H_$(2))) - $(Q)rm -f $$(call STDLIB_GLOB,$$(HLIB$(1)_H_$(2)))) - $(Q)rm -f $$(call LIBRUSTC_GLOB,$$(HLIB$(1)_H_$(2))) - $(Q)rm -f $$(call LIBSYNTAX_GLOB,$$(HLIB$(1)_H_$(2))) + $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB) + $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB) + $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB) + $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB) $(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM) $(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib @@ -88,10 +88,10 @@ clean$(1)_T_$(2)_H_$(3): $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX) - $(Q)rm -f $$(call CORELIB_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) - $(Q)rm -f $$(call STDLIB_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) - $(Q)rm -f $$(call LIBRUSTC_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) - $(Q)rm -f $$(call LIBSYNTAX_GLOB,$$(TLIB$(1)_T_$(2)_H_$(3))) + $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB) + $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB) + $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB) + $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM) $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib $(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a diff --git a/mk/host.mk b/mk/host.mk index d416b64e4948..c71e48f6f120 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -30,7 +30,8 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \ $$(HSTDLIB_DEFAULT$(2)_H_$(3)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(call LIBRUSTC_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ + $$(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))/$$(CFG_LIBSYNTAX): \ @@ -41,7 +42,8 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \ $$(HSTDLIB_DEFAULT$(2)_H_$(3)) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(call LIBSYNTAX_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ + $$(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))/$$(CFG_RUNTIME): \ @@ -54,7 +56,15 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \ $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(call CORELIB_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ +# 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) \ + $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \ $$(HLIB$(2)_H_$(4)) $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \ @@ -63,7 +73,8 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \ $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) @$$(call E, cp: $$@) $$(Q)cp $$< $$@ - $$(Q)cp -R $$(call STDLIB_GLOB,$$(TLIB$(1)_T_$(4)_H_$(3))) \ + $$(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))/libcore.rlib: \ diff --git a/mk/install.mk b/mk/install.mk index fe9428eade06..029fa30e7b8f 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -6,12 +6,11 @@ # destination directory as arg 2, and filename/libname-glob as arg 3 ifdef VERBOSE INSTALL = install -m755 $(1)/$(3) $(2)/$(3) - INSTALL_LIB = install -m644 $(3) $(2)/ + INSTALL_LIB = install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/ else INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3) - INSTALL_LIB = $(Q)$(call E, install_lib: \ - $(addprefix $(2)/,$(basename $(3)))) && \ - install -m644 $(3) $(2)/ + INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \ + install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/ endif # The stage we install from @@ -38,17 +37,13 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(Q)mkdir -p $$(PTL$(1)$(2)) $$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME)) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ - $$(call CORELIB_GLOB,$$(TL$(1)$(2)))) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CORELIB_GLOB)) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ - $$(call STDLIB_GLOB,$$(TL$(1)$(2)))) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(STDLIB_GLOB)) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ - $$(call LIBRUSTC_GLOB,$$(TL$(1)$(2)))) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB)) $$(Q)$$(call INSTALL_LIB, \ - $$(TL$(1)$(2)),$$(PTL$(1)$(2)),\ - $$(call LIBSYNTAX_GLOB,$$(TL$(1)$(2)))) + $$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB)) $$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a) endef @@ -79,10 +74,10 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE)) $(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X)) $(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME)) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call CORELIB_GLOB,$(PHL))) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call STDLIB_GLOB,$(PHL))) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call LIBRUSTC_GLOB,$(PHL))) - $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(call LIBSYNTAX_GLOB,$(PHL))) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB)) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB)) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB)) + $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB)) $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM)) $(Q)$(call INSTALL,$(S)/man, \ $(PREFIX_ROOT)/share/man/man1,rustc.1) @@ -91,7 +86,7 @@ install-targets: $(INSTALL_TARGET_RULES) HOST_LIB_FROM_HL_GLOB = \ - $(patsubst $(HL)/%,$(PHL)/%,$(1)) + $(patsubst $(HL)/%,$(PHL)/%,$(wildcard $(HL)/$(1))) uninstall: $(Q)rm -f $(PHB)/rustc$(X) @@ -100,10 +95,10 @@ uninstall: $(Q)rm -f $(PHL)/$(CFG_RUSTLLVM) $(Q)rm -f $(PHL)/$(CFG_RUNTIME) $(Q)for i in \ - $(call HOST_LIB_FROM_HL_GLOB,$(call CORELIB_GLOB,$(HL))) \ - $(call HOST_LIB_FROM_HL_GLOB,$(call STDLIB_GLOB,$(HL))) \ - $(call HOST_LIB_FROM_HL_GLOB,$(call LIBRUSTC_GLOB,$(HL))) \ - $(call HOST_LIB_FROM_HL_GLOB,$(call LIBSYNTAX_GLOB,$(HL))) \ + $(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \ + $(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \ ; \ do rm -f $$i ; \ done diff --git a/mk/platform.mk b/mk/platform.mk index fdc361a8a67c..43a943347a57 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -21,7 +21,7 @@ CFG_DSYMUTIL := true ifneq ($(findstring freebsd,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).so - CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.so) + CFG_LIB_GLOB=lib$(1)-*.so CFG_GCCISH_CFLAGS += -fPIC -I/usr/local/include CFG_GCCISH_LINK_FLAGS += -shared -fPIC -lpthread -lrt CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list= @@ -40,7 +40,7 @@ endif ifneq ($(findstring linux,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).so - CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.so) + CFG_LIB_GLOB=lib$(1)-*.so CFG_GCCISH_CFLAGS += -fPIC CFG_GCCISH_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt CFG_GCCISH_DEF_FLAG := -Wl,--export-dynamic,--dynamic-list= @@ -76,7 +76,8 @@ endif ifneq ($(findstring darwin,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).dylib - CFG_LIB_GLOB=$(wildcard $(1)/lib$(2)-*.dylib $(1)/lib$(2)-*.dylib.dSYM) + CFG_LIB_GLOB=lib$(1)-*.dylib + CFG_LIB_DSYM_GLOB=lib$(1)-*.dylib.dSYM CFG_UNIXY := 1 CFG_LDENV := DYLD_LIBRARY_PATH CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind @@ -173,7 +174,7 @@ ifdef CFG_WINDOWSY CFG_EXE_SUFFIX := .exe CFG_LIB_NAME=$(1).dll - CFG_LIB_GLOB=$(wildcard $(1)/$(2)-*.dll) + CFG_LIB_GLOB=$(1)-*.dll CFG_DEF_SUFFIX := .def ifdef MSYSTEM CFG_LDPATH :=$(CFG_LDPATH):$$PATH From 86dfca278dd5f9f589cecfe6de91ad8264c300d0 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 11 Jul 2012 15:10:18 -0700 Subject: [PATCH 5/8] Try less complicated trick for solving the dSYM glob portability issue. --- mk/host.mk | 11 ----------- mk/platform.mk | 4 ++-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/mk/host.mk b/mk/host.mk index c71e48f6f120..3c35e4beb040 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -31,7 +31,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \ @$$(call E, cp: $$@) $$(Q)cp $$< $$@ $$(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))/$$(CFG_LIBSYNTAX): \ @@ -43,7 +42,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \ @$$(call E, cp: $$@) $$(Q)cp $$< $$@ $$(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))/$$(CFG_RUNTIME): \ @@ -56,15 +54,7 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \ $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) @$$(call E, 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) \ - $$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(CORELIB_DSYM_GLOB)) \ $$(HLIB$(2)_H_$(4)) $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \ @@ -74,7 +64,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \ @$$(call E, cp: $$@) $$(Q)cp $$< $$@ $$(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))/libcore.rlib: \ diff --git a/mk/platform.mk b/mk/platform.mk index 43a943347a57..ec3c5174b56b 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -76,8 +76,8 @@ endif ifneq ($(findstring darwin,$(CFG_OSTYPE)),) CFG_LIB_NAME=lib$(1).dylib - CFG_LIB_GLOB=lib$(1)-*.dylib - CFG_LIB_DSYM_GLOB=lib$(1)-*.dylib.dSYM + # needs trailing * to pick up the .dSYM file too + CFG_LIB_GLOB=lib$(1)-*.dylib* CFG_UNIXY := 1 CFG_LDENV := DYLD_LIBRARY_PATH CFG_GCCISH_LINK_FLAGS += -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind From 91d9ded4bea3f4bf876eabbfe6f8e27c024523cc Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Wed, 11 Jul 2012 20:09:57 -0700 Subject: [PATCH 6/8] Fix an error for Centos 5 Unfortunately this doesn't get rust to compile on Centos 5. Centos 5 uses glibc 2.5, but the snapshot-0 needs glibc 2.6+. --- src/rt/rust_signal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rt/rust_signal.h b/src/rt/rust_signal.h index 3f27f1fad97c..052c753a5521 100644 --- a/src/rt/rust_signal.h +++ b/src/rt/rust_signal.h @@ -5,6 +5,7 @@ class rust_signal { public: virtual void signal() = 0; + virtual ~rust_signal() {} }; #endif /* RUST_SIGNAL_H */ From df8481a9c31e1a4773515cfd1ea05a5d5d488578 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 12 Jul 2012 12:34:28 -0700 Subject: [PATCH 7/8] Update version on man page. --- man/rustc.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/rustc.1 b/man/rustc.1 index 2d98d622322d..f1a0a0131e13 100644 --- a/man/rustc.1 +++ b/man/rustc.1 @@ -1,4 +1,4 @@ -.TH RUSTC "1" "May 2012" "rustc 0.2 (23fcab9)" "User Commands" +.TH RUSTC "1" "July 2012" "rustc 0.3" "User Commands" .SH NAME rustc \- rust compiler .SH SYNOPSIS From 2f32a1581f522e524009138b33b1c7049ced668d Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 12 Jul 2012 12:41:39 -0700 Subject: [PATCH 8/8] Fix make-install target on mac. --- mk/install.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/install.mk b/mk/install.mk index 029fa30e7b8f..3a2dbceaaad3 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -6,11 +6,11 @@ # destination directory as arg 2, and filename/libname-glob as arg 3 ifdef VERBOSE INSTALL = install -m755 $(1)/$(3) $(2)/$(3) - INSTALL_LIB = install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/ + INSTALL_LIB = install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/ else INSTALL = $(Q)$(call E, install: $(2)/$(3)) && install -m755 $(1)/$(3) $(2)/$(3) INSTALL_LIB = $(Q)$(call E, install_lib: $(2)/$(3)) && \ - install -m644 `ls -rt1 $(1)/$(3) | tail -1` $(2)/ + install -m644 `ls -drt1 $(1)/$(3) | tail -1` $(2)/ endif # The stage we install from