about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-09-23 18:55:01 +0000
committerbors <bors@rust-lang.org>2015-09-23 18:55:01 +0000
commitafae2ff723393b3ab4ccffef6ac7c6d1809e2da0 (patch)
tree64f9bfbfd8b79d3dc21cdab9f7b170c366c62c7e /src
parentedeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8 (diff)
parent8474af03218101e1b6adae323dcd840ffc267158 (diff)
downloadrust-afae2ff723393b3ab4ccffef6ac7c6d1809e2da0.tar.gz
rust-afae2ff723393b3ab4ccffef6ac7c6d1809e2da0.zip
Auto merge of #28569 - semarie:stdcpp-tests, r=alexcrichton
extend the search path of libraries to /usr/local/lib in `run-make`
testsuite. It should permit to find libstdc++.so on usual directory.

r? @alexcrichton 
Diffstat (limited to 'src')
-rw-r--r--src/test/run-make/tools.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/run-make/tools.mk b/src/test/run-make/tools.mk
index 14d8e468f50..23af568697f 100644
--- a/src/test/run-make/tools.mk
+++ b/src/test/run-make/tools.mk
@@ -85,6 +85,11 @@ ifeq ($(UNAME),Bitrig)
 else
 ifeq ($(UNAME),OpenBSD)
 	EXTRACFLAGS := -lm -lpthread
+	# extend search lib for found estdc++ if build using gcc from
+	# ports under OpenBSD. This is needed for:
+	#  - run-make/execution-engine
+	#  - run-make/issue-19371
+	RUSTC := $(RUSTC) -L/usr/local/lib
 else
 	EXTRACFLAGS := -lm -lrt -ldl -lpthread
 	EXTRACXXFLAGS := -lstdc++