Skip to content

Commit 27c32c6

Browse files
committed
Default linker to ld on linux and fix missing headers (#2402)
* default linker to ld on linux * fix failing test following toolchain change * add missing header following platform change
1 parent f2578f8 commit 27c32c6

File tree

8 files changed

+8
-3
lines changed

8 files changed

+8
-3
lines changed

testsuite/test_0134/data/test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include <cinttypes>
1414
#include <vector>
15+
#include <string>
1516

1617
PXR_NAMESPACE_USING_DIRECTIVE
1718

testsuite/test_0142/data/test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include <cstdio>
44
#include <cstring>
55
#include <iostream>
6+
#include <string>
67

78
int main(int argc, char **argv)
89
{

testsuite/test_0146/data/test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <cinttypes>
1010
#include <vector>
11+
#include <string>
1112

1213
PXR_NAMESPACE_USING_DIRECTIVE
1314

testsuite/test_0208/data/test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <cstring>
55
#include <iostream>
66
#include <vector>
7+
#include <string>
78

89
int main(int argc, char **argv)
910
{

testsuite/test_2072.1/data/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <ai.h>
2-
2+
#include <stdio.h>
33
//#define LOG_FLAGS AI_LOG_ALL
44
#define LOG_FLAGS AI_LOG_WARNINGS | AI_LOG_ERRORS
55

testsuite/test_2072.2/data/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <ai.h>
2-
2+
#include <stdio.h>
33
//#define LOG_FLAGS AI_LOG_ALL
44
#define LOG_FLAGS AI_LOG_WARNINGS | AI_LOG_ERRORS
55

testsuite/test_2303/data/test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <ai.h>
22

33
#include <vector>
4+
#include <string>
45

56
//#define LOG_FLAGS AI_LOG_ALL
67
#define LOG_FLAGS AI_LOG_WARNINGS | AI_LOG_ERRORS

tools/scons-custom/site_tools/clang.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class ClangWarning(SCons.Warnings.Warning): pass
152152
# Special linker detection in linux
153153
if sa.system.is_linux:
154154
# Name of the linker (eg. ld, gold, bfd, lld, etc.). It defaults to "gold"
155-
linker_name = env.get('LINKER_NAME', 'gold').replace('ld.', '', 1)
155+
linker_name = env.get('LINKER_NAME', 'ld').replace('ld.', '', 1)
156156
# Regular expresions for detecting the linker version
157157
regex_version = r'(?:[0-9]+)(?:\.(?:[0-9])+)*'
158158
linker_regex = {

0 commit comments

Comments
 (0)