fix(build): correctly set target-specific variable values #741
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: Previously, the `HGNAME` and `OSS` variables were not being set correctly when building with `make oss`. In my version of GNU Make on Ubuntu 22.04: ``` GNU Make 4.3 Built for x86_64-pc-linux-gnu ``` instead of the `OSS` variable being set to `true` and `HGNAME` being set to `sl`, the `OSS` variable was being set to `true HGNAME=sl`. This was causing the eden binary to be built with the default `HGNAME` value of `hg`. Here is a minimal example of the issue: ```makefile HG_NAME = hg oss: OSS=true HG_NAME=sl oss: local local: @echo "OSS is $(OSS)" @echo "Building for $(HG_NAME)" ``` On my machine `make oss` prints ``` OSS is true HG_NAME=sl Building for hg ``` However, ```makefile HG_NAME = hg oss: OSS=true oss: HG_NAME=sl oss: local local: @echo "OSS is $(OSS)" @echo "Building for $(HG_NAME)" ``` prints ``` OSS is true Building for sl ``` Test Plan: 1. On Ubuntu 22.04 and GNU Make 4.3, build sapling with `make oss` 2. should see an error like ```bash running build_mo rm -f hg cp build/scripts-3*/hg hg cp: cannot stat 'build/scripts-3*/hg': No such file or directory make: *** [Makefile:85: local] Error 1 ``` 3. apply this patch and repeat step 1 4. `sl` should build successfully
Contributor
|
@zzl0 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix(build): correctly set target-specific variable values
Summary:
Previously, the
HGNAMEandOSSvariables were not being set correctly whenbuilding with
make oss. In my version of GNU Make on Ubuntu 22.04:instead of the
OSSvariable being set totrueandHGNAMEbeing set tosl, theOSSvariable was being set totrue HGNAME=sl. This was causingthe eden binary to be built with the default
HGNAMEvalue ofhg.Here is a minimal example of the issue:
On my machine
make ossprintsHowever,
prints
Test Plan:
make ossslshould build successfully