Skip to content

Commit

Permalink
mk: Fix LD_LIBRARY_PATH_ENV_NAMES in cross build
Browse files Browse the repository at this point in the history
  • Loading branch information
@klutzy
klutzy committed Jul 16, 2014
1 parent 2692ae1 commit 711e439
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mk/main.mk
View file
Expand Up @@ -377,7 +377,7 @@ define SREQ_CMDS
ifeq ($$(OSTYPE_$(3)),apple-darwin)
LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3) := DYLD_LIBRARY_PATH
else
ifeq ($$(CFG_WINDOWSY_$(2)),1)
ifeq ($$(CFG_WINDOWSY_$(3)),1)
LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3) := PATH
else
LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3) := LD_LIBRARY_PATH
Expand Down

5 comments on commit 711e439

@bors
Copy link
Contributor

@bors bors commented on 711e439 Jul 17, 2014

Choose a reason for hiding this comment

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

saw approval from alexcrichton
at klutzy@711e439

@bors
Copy link
Contributor

@bors bors commented on 711e439 Jul 17, 2014

Choose a reason for hiding this comment

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

merging klutzy/rust/cross-ld-library = 711e439 into auto

@bors
Copy link
Contributor

@bors bors commented on 711e439 Jul 17, 2014

Choose a reason for hiding this comment

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

klutzy/rust/cross-ld-library = 711e439 merged ok, testing candidate = 92b5bf8

@bors
Copy link
Contributor

@bors bors commented on 711e439 Jul 17, 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 = 92b5bf8

Please sign in to comment.