Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
4e9f855b
Commit
4e9f855b
authored
Dec 08, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegcc: Look for ntdll.so instead of libwine.so to find the library directory.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6ddd6e83
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
winegcc.c
tools/winegcc/winegcc.c
+8
-8
No files found.
tools/winegcc/winegcc.c
View file @
4e9f855b
...
...
@@ -638,7 +638,7 @@ static const char *get_multiarch_dir( enum target_cpu cpu )
static
char
*
get_lib_dir
(
struct
options
*
opts
)
{
const
char
*
stdlibpath
[]
=
{
libdir
,
LIBDIR
,
"/usr/lib"
,
"/usr/local/lib"
,
"/lib"
};
static
const
char
libwine
[]
=
"/libwine
.so"
;
static
const
char
ntdll
[]
=
"/wine/ntdll
.so"
;
const
char
*
bit_suffix
,
*
other_bit_suffix
,
*
build_multiarch
,
*
target_multiarch
;
const
char
*
root
=
opts
->
sysroot
?
opts
->
sysroot
:
""
;
unsigned
int
i
;
...
...
@@ -658,31 +658,31 @@ static char *get_lib_dir( struct options *opts )
if
(
!
stdlibpath
[
i
])
continue
;
buffer
=
xmalloc
(
strlen
(
root
)
+
strlen
(
stdlibpath
[
i
])
+
strlen
(
"/arm-linux-gnueabi"
)
+
strlen
(
libwine
)
+
1
);
strlen
(
"/arm-linux-gnueabi"
)
+
strlen
(
ntdll
)
+
1
);
strcpy
(
buffer
,
root
);
strcat
(
buffer
,
stdlibpath
[
i
]
);
p
=
buffer
+
strlen
(
buffer
);
while
(
p
>
buffer
&&
p
[
-
1
]
==
'/'
)
p
--
;
strcpy
(
p
,
libwine
);
strcpy
(
p
,
ntdll
);
if
(
check_platform
(
opts
,
buffer
))
goto
found
;
if
(
p
>
buffer
+
2
&&
(
!
memcmp
(
p
-
2
,
"32"
,
2
)
||
!
memcmp
(
p
-
2
,
"64"
,
2
)))
{
p
-=
2
;
strcpy
(
p
,
libwine
);
strcpy
(
p
,
ntdll
);
if
(
check_platform
(
opts
,
buffer
))
goto
found
;
}
strcpy
(
p
,
bit_suffix
);
strcat
(
p
,
libwine
);
strcat
(
p
,
ntdll
);
if
(
check_platform
(
opts
,
buffer
))
goto
found
;
strcpy
(
p
,
target_multiarch
);
strcat
(
p
,
libwine
);
strcat
(
p
,
ntdll
);
if
(
check_platform
(
opts
,
buffer
))
goto
found
;
strcpy
(
buffer
,
root
);
strcat
(
buffer
,
stdlibpath
[
i
]
);
p
=
buffer
+
strlen
(
buffer
);
while
(
p
>
buffer
&&
p
[
-
1
]
==
'/'
)
p
--
;
strcpy
(
p
,
libwine
);
strcpy
(
p
,
ntdll
);
/* try to fixup each parent dirs named lib, lib32 or lib64 with target bitness suffix */
while
(
p
>
buffer
)
...
...
@@ -724,7 +724,7 @@ static char *get_lib_dir( struct options *opts )
continue
;
found:
buffer
[
strlen
(
buffer
)
-
strlen
(
libwine
)]
=
0
;
buffer
[
strlen
(
buffer
)
-
strlen
(
ntdll
)]
=
0
;
return
buffer
;
}
return
strmake
(
"%s%s"
,
root
,
LIBDIR
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment