Skip to content

Commit

Permalink
mk: Fix 'make dist' on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
@brson
brson committed Mar 31, 2014
1 parent 612e22e commit 4aa7a8a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/dist.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt \
--resources tmp/dist/pkgres-$(1) dist/$(PKG_NAME)-$(1).pkg
$(Q)rm -rf tmp rust.pkg

tmp/dist/pkgres-$(1)/LICENSE.txt: $(S)/LICENSE.txt
tmp/dist/pkgres-$(1)/LICENSE.txt: LICENSE.txt
@$$(call E,pkg resource LICENSE.txt)
$(Q)mkdir -p $$(@D)
$(Q)cp $$< $$@
Expand Down

5 comments on commit 4aa7a8a

@bors
Copy link
Contributor

@bors bors commented on 4aa7a8a Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from sfackler
at brson@4aa7a8a

@bors
Copy link
Contributor

@bors bors commented on 4aa7a8a Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/dist-mac = 4aa7a8a into auto

@bors
Copy link
Contributor

@bors bors commented on 4aa7a8a Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/dist-mac = 4aa7a8a merged ok, testing candidate = 7a70c69

@bors
Copy link
Contributor

@bors bors commented on 4aa7a8a Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/4968
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/4971
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/4062
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4074
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/5070
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4155
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4163
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/5070
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4155
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4160
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/4226
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/1958
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/5067
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4165
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4175
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/4832

@bors
Copy link
Contributor

@bors bors commented on 4aa7a8a Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 7a70c69

Please sign in to comment.