summaryrefslogtreecommitdiff
authorPekka Paalanen <ppaalanen@gmail.com>2012-08-22 05:28:53 (GMT)
committer Pekka Paalanen <ppaalanen@gmail.com>2012-08-22 07:12:20 (GMT)
commitf37fee0c7b55f87c1afc12210f3516de0f1b71b0 (patch) (side-by-side diff)
tree40d0fdde3e722da0d44824cb89dbbb33ae380766
parent7df9abc31471c18bf17389fb207755c55c8cb802 (diff)
downloadandrogenizer-f37fee0c7b55f87c1afc12210f3516de0f1b71b0.tar.gz
androgenizer-f37fee0c7b55f87c1afc12210f3516de0f1b71b0.tar.bz2
flag -no-undefined does not take arguments
Fix the dropping of the flag -no-undefined. It does not take any arguments, so we were dropping the following argument incorrectly.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--README.txt3
-rw-r--r--options.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/README.txt b/README.txt
index 07a0b54..4025de8 100644
--- a/README.txt
+++ b/README.txt
@@ -85,7 +85,8 @@ Adding resources to modules (a module must be declared first!):
-L and -R will be silently removed
-pthread and -lpthread will be silently removed
-lrt will be silently removed (rt is a built-in library in bionic)
- -dlopen, -version-info, -no-undefined and the word following those
+ -no-undefined will be silently removed
+ -dlopen, -version-info, and the word following those
(the option argument) will be silently removed
Of plain file arguments, only *.a and *.la files are kept, all others
are silently dropped.
diff --git a/options.c b/options.c
index 35a4d98..33e02b8 100644
--- a/options.c
+++ b/options.c
@@ -393,13 +393,13 @@ static int add_ldflag(struct module *m, char *flag, enum build_type btype)
}
if ((strcmp(flag, "-pthread") == 0) ||
(strcmp(flag, "-lpthread") == 0) ||
- (strcmp(flag, "-lrt") == 0)) {
+ (strcmp(flag, "-lrt") == 0) ||
+ (strcmp(flag, "-no-undefined") == 0)) {
free(flag);
return 0;
}
if ((strcmp(flag, "-dlopen") == 0) ||
- (strcmp(flag, "-version-info") == 0) ||
- (strcmp(flag, "-no-undefined") == 0)) {
+ (strcmp(flag, "-version-info") == 0)) {
free(flag);
return 1;
}