Skip to content

Commit c7d95c0

Browse files
sggutierfacebook-github-bot
authored andcommitted
build: fix binary name produced on make oss (#60)
Summary: When running `make oss` or `make install-oss`, both a `hg` and a `sl` binaries would be produced under `eden/scm/build/scripts-*/`. For `make oss` a `hg` binary was produced at `eden/scm` and when running make install, `hg` and `sl` binaries were created under `$DESTDIR/usr/local/bin/`. This diff fixes both of the previously mentioned behaviors so that now only a `sl` binary is created at `eden/scm`, `eden/scm/build/scripts-*/`, and `$DESTDIR/usr/local/bin/`. X-link: facebookarchive/sapling-staging#60 Reviewed By: bolinfest Differential Revision: D41047258 Pulled By: sggutier fbshipit-source-id: 4fde9c659be4e69105105922a2711575ac4073eb
1 parent 7f40624 commit c7d95c0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

eden/scm/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,10 @@ wheelhouse/
8787
hg-python
8888
hg.py
8989

90-
# mercurial binary
90+
# scm binary
9191
hg
9292
hg3
93+
sl
9394

9495
# make-local Windows artifacts
9596
hgrc.d

eden/scm/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ help:
6767
all: build
6868

6969
oss:
70-
export HGNAME=sl
71-
SAPLING_OSS_BUILD=true \
70+
$(eval HGNAME = sl)
71+
SAPLING_OSS_BUILD=true HGNAME=$(HGNAME) \
7272
$(shell $(PYTHON3) contrib/pick_python.py $(PYTHON3)) setup_with_version.py $(PURE) \
7373
build_interactive_smartlog \
7474
build_py -c -d . \

0 commit comments

Comments
 (0)